Skip to content

Commit

Permalink
R-Corp Assault 2.0 Release (vlggms#1600)
Browse files Browse the repository at this point in the history
* rcorp update

Update city2.dmm

finishes Arbiter gamemode

Update lobotomy-corp13.dme

various updates, this all gets crunched anyways

Create rcorp.dm

Update beaches.dmm

Update landmarks.dm

Update offices.dmm

asd

Update landmarks.dm

Update objective.dm

Update objective.dm

more drip

Fuck it, give the LCDR a Zwei knife

more zombies

adds in the city

adds in elevator and hallway maps

adds in officer armor vest

adds in new objectives

Update gadgets.dm

Update gadgets.dm

asd

Update maptype.dm

Update mobs.dm

Update city.dmm

adds in command posts

asd

Update objective.dm

updates gun names and spawning

adds in no-xeno skeld and nerfs rambo shrimp

Update xenos.dmm

asd

Update rcorp.dmm

Update command.dm

Update gadgets.dm

Update command.dm

Update rcorp.dmm

asd

Update random_maps.dm

Update mobs.dm

Update mobs.dm

asd

Update standard.dmm

Update random_maps.dm

asd

asd

Adds new abnos

Update lc_ammo.dm

map updates

map updates

asd

Revert "Update random_maps.dm"

This reverts commit b3b1125.

Update random_maps.dm

Update game_options.txt

dfs

asd

updates rats

Update command.dm

Update command.dm

asd

asd

asd

adds 5th pack

asd

Update card.dmi

sdfasd

Update rat.dm

Update rat.dm

Revert "sprite addition"

This reverts commit 6d6512c.

sprite addition

* replaces for spans.
  • Loading branch information
Kitsunemitsu authored Dec 1, 2023
1 parent c725271 commit 192fdc4
Show file tree
Hide file tree
Showing 75 changed files with 165,203 additions and 5,733 deletions.
Binary file modified ModularTegustation/Teguicons/lc13_weapons.dmi
Binary file not shown.
50 changes: 50 additions & 0 deletions ModularTegustation/tegu_items/rcorp/basecode.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
/obj/effect/spawner/room/rcorp_base
name = "rcorp base spawner"
icon_state = "random_room"
room_width = 49
room_height = 35
room_type = "rcorp_fourth"
/*
/obj/effect/spawner/room/rcorp_base/Initialize()
if(SSmaptype.jobtype == "rcorp_fifth")
room_type = "rcorp_fifth"
..()*/
/datum/map_template/random_room/rcorp
centerspawner = FALSE
template_width = 49
template_height = 35
/datum/map_template/random_room/rcorp/fourth
name = "R-Corp 4th pack Base"
room_id = "rcorp_base_fourth"
mappath = "_maps/templates/rcorp_base/fourthpack.dmm"
room_type = "rcorp_fourth"
weight = 5*/

/*
/datum/map_template/random_room/rcorp/fifth
name = "R-Corp 5th pack Base"
room_id = "rcorp_base_fifth"
mappath = "_maps/templates/rcorp_base/fifthpack.dmm"
room_type = "rcorp_fifth"
weight = 5*/


/obj/effect/spawner/room/rcorp_base
name = "rcorp facility spawner"
icon_state = "random_room"
room_width = 49
room_height = 35
room_type = "rcorp_fourth" // Used so we can place landmarks in ruins and such.


/datum/map_template/random_room/rcorp/fourth
centerspawner = FALSE
template_width = 49
template_height = 35
room_type = "rcorp_fourth"
weight = 1
mappath = "_maps/templates/rcorp_base/fourthpack.dmm"
46 changes: 46 additions & 0 deletions ModularTegustation/tegu_items/rcorp/gadgets.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/obj/item/disk/nuclear/rcorp
name = "r-corp command tracker"
desc = "Hold this on your person to let any rabbits know your precise location."
icon_state = "servo"

/obj/item/pinpointer/nuke/rcorp
name = "r-corp command tracker"
desc = "This tracks the current holder of the command tracker."

/obj/item/pinpointer/nuke/rcorp/Initialize()
..()
toggle_on()

//Shelters
/datum/map_template/shelter/command
name = "Large Command Shelter"
shelter_id = "shelter_command"
description = "A little bit of requisitions, medical and command equipment is all here."
mappath = "_maps/templates/shelter_command.dmm"

/obj/item/survivalcapsule/rcorpcommand
name = "large command shelter capsule"
desc = "A luxury command post in a capsule."
template_id = "shelter_command"

/datum/map_template/shelter/smallcommand
name = "Small Command Shelter"
shelter_id = "shelter_smallcommand"
description = "A little bit of requisitions, medical and command equipment is all here."
mappath = "_maps/templates/shelter_smallcommand.dmm"

/obj/item/survivalcapsule/rcorpsmallcommand
name = "small command shelter capsule"
desc = "A small command post in a capsule."
template_id = "shelter_smallcommand"

//Announcement machines
/obj/item/announcementmaker
name = "r-corp announcement tablet"
icon = 'icons/obj/modular_tablet.dmi'
icon_state = "tablet-red"

/obj/item/announcementmaker/attack_self(mob/living/user)
..()
var/input = stripped_input(user,"What do you want announce?", ,"Test Announcement")
minor_announce("[input]" , "Announcement from: [user.name]")
81 changes: 73 additions & 8 deletions ModularTegustation/tegu_items/rcorp/itemspawner.dm
Original file line number Diff line number Diff line change
@@ -1,21 +1,30 @@
//Split into weapons and not weapons.
/obj/effect/landmark/rcorpitemspawn
name = "spawner for rcrop"
name = "rcorp requisitions"
desc = "It spawns an item. Notify a coder. Thanks!"
icon = 'icons/effects/landmarks_static.dmi'
icon_state = "x4"
var/list/possible_items = list(
/obj/item/storage/firstaid/revival,
/obj/item/grenade/smokebomb,
/obj/item/ksyringe,
/obj/item/reagent_containers/hypospray/medipen/salacid,
/obj/item/reagent_containers/hypospray/medipen/mental,
/obj/item/stack/sheet/mineral/sandbags,
/obj/item/weldingtool,
/obj/item/stack/sheet/mineral/sandbags/ten,
/obj/item/flashlight/flare,
/obj/item/kcrit,
)
var/list/possible_weapons = list(
/obj/item/gun/energy/e_gun/rabbitdash,
/obj/item/gun/energy/e_gun/rabbitdash/small,
/obj/item/gun/energy/e_gun/rabbitdash/sniper,
/obj/item/gun/energy/e_gun/rabbitdash/white,)
/obj/item/gun/energy/e_gun/rabbitdash/white,
/obj/item/gun/energy/e_gun/rabbitdash/black,
/obj/item/gun/energy/e_gun/rabbitdash/shotgun,
// /obj/item/gun/energy/e_gun/rabbitdash/laser,
/obj/item/gun/energy/e_gun/rabbitdash/pale,
/obj/item/gun/energy/e_gun/rabbit/minigun,
/obj/item/gun/energy/e_gun/rabbitdash/heavy,
)


/obj/effect/landmark/rcorpitemspawn/Initialize()
Expand All @@ -24,15 +33,71 @@
if(prob(30))
spawning = pick(possible_weapons)
new spawning(get_turf(src))
var/timeradd = rand(1200, 3000)
var/timeradd = rand(1200, 1800)
addtimer(CALLBACK(src, .proc/spawnagain), timeradd)

/obj/effect/landmark/rcorpitemspawn/proc/spawnagain()
var/timeradd = rand(1200, 3000)
var/timeradd = rand(1200, 1800)
addtimer(CALLBACK(src, .proc/spawnagain), timeradd)

if(prob(80)) //20% to spawn
if(prob(50)) //50% to spawn
return

var/spawning = pick(possible_items)
new spawning(get_turf(src))


//for the zombie mode
/obj/effect/landmark/zombiespawn
name = "rcorp sweeperspawn"
desc = "It spawns sweepers. Notify a coder. Thanks!"
icon = 'icons/effects/landmarks_static.dmi'
icon_state = "tdome_admin"

/obj/effect/landmark/zombiespawn/Initialize()
..()
spawnzombie()

/obj/effect/landmark/zombiespawn/proc/spawnzombie()
var/timeradd = rand(300, 1000)
addtimer(CALLBACK(src, .proc/spawnzombie), timeradd)
var/mob/living/simple_animal/hostile/sweeper/A = new(get_turf(src))


var/obj/effect/proc_holder/spell/targeted/night_vision/bloodspell = new
A.AddSpell(bloodspell)
A.faction += "hostile"

//Randomize the rhino
/obj/effect/landmark/rhinospawner
name = "rhino spawner"
desc = "It spawns an item. Notify a coder. Thanks!"
icon = 'icons/effects/landmarks_static.dmi'
icon_state = "x4"
var/list/possible_mecha = list(/obj/vehicle/sealed/mecha/combat/rhino,
/obj/vehicle/sealed/mecha/combat/rhinosupport,
/obj/vehicle/sealed/mecha/combat/rhinoshotgun,
/obj/vehicle/sealed/mecha/combat/rhinorifle,)

/obj/effect/landmark/rhinospawner/Initialize()
..()
var/spawning = pick(possible_mecha)
if(prob(1))
spawning = /obj/vehicle/sealed/mecha/combat/tank
if(SSmaptype.jobtype)
return
new spawning(get_turf(src))


//Split into weapons and not weapons.
/obj/effect/landmark/wallspawner
name = "wall spawner"
desc = "It spawns a wall or not. Who knows? Notify a coder. Thanks!"
icon = 'icons/effects/landmarks_static.dmi'
icon_state = "x4"

/obj/effect/landmark/wallspawner/Initialize()
..()
if(!SSmaptype.jobtype)
return
new /turf/closed/wall/mineral/titanium/survival/pod(get_turf(src))
45 changes: 38 additions & 7 deletions ModularTegustation/tegu_items/rcorp/landmarks.dm
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
GLOBAL_LIST_INIT(easycombat, list(
/mob/living/simple_animal/hostile/abnormality/ppodae,
/mob/living/simple_animal/hostile/abnormality/blue_shepherd,
/mob/living/simple_animal/hostile/abnormality/kqe,
/mob/living/simple_animal/hostile/abnormality/dimensional_refraction,
/mob/living/simple_animal/hostile/abnormality/helper,
/mob/living/simple_animal/hostile/abnormality/apex_predator))
/mob/living/simple_animal/hostile/abnormality/apex_predator,
/mob/living/simple_animal/hostile/abnormality/cleaner,
/mob/living/simple_animal/hostile/abnormality/smile))

GLOBAL_LIST_INIT(easysupport, list(/mob/living/simple_animal/hostile/abnormality/fragment,
/mob/living/simple_animal/hostile/abnormality/funeral,
Expand All @@ -16,29 +17,43 @@ GLOBAL_LIST_INIT(easysupport, list(/mob/living/simple_animal/hostile/abnormality

GLOBAL_LIST_INIT(easytank, list(/mob/living/simple_animal/hostile/abnormality/jangsan,
/mob/living/simple_animal/hostile/abnormality/scarecrow,
/mob/living/simple_animal/hostile/abnormality/warden,
/mob/living/simple_animal/hostile/abnormality/black_swan,))
/mob/living/simple_animal/hostile/abnormality/black_swan,
/mob/living/simple_animal/hostile/abnormality/kqe,))

GLOBAL_LIST_INIT(hardcombat, list(
/mob/living/simple_animal/hostile/abnormality/clouded_monk,
/mob/living/simple_animal/hostile/abnormality/clown,
/mob/living/simple_animal/hostile/abnormality/nosferatu,
/mob/living/simple_animal/hostile/abnormality/big_bird,
/mob/living/simple_animal/hostile/abnormality/big_wolf))
/mob/living/simple_animal/hostile/abnormality/big_wolf,
/mob/living/simple_animal/hostile/abnormality/warden,
/mob/living/simple_animal/hostile/abnormality/fire_bird,
))

GLOBAL_LIST_INIT(hardsupport, list(/mob/living/simple_animal/hostile/abnormality/sphinx,
/mob/living/simple_animal/hostile/abnormality/judgement_bird,
/mob/living/simple_animal/hostile/abnormality/ebony_queen,
/mob/living/simple_animal/hostile/abnormality/thunder_bird,
/mob/living/simple_animal/hostile/abnormality/despair_knight,
/mob/living/simple_animal/hostile/abnormality/alriune))
/mob/living/simple_animal/hostile/abnormality/yin,
/mob/living/simple_animal/hostile/abnormality/pygmalion,
/mob/living/simple_animal/hostile/abnormality/alriune,
))

GLOBAL_LIST_INIT(hardtank, list(/mob/living/simple_animal/hostile/abnormality/melting_love,
/mob/living/simple_animal/hostile/abnormality/nothing_there,
/mob/living/simple_animal/hostile/abnormality/censored,
/mob/living/simple_animal/hostile/abnormality/titania,
/mob/living/simple_animal/hostile/abnormality/golden_apple,
/mob/living/simple_animal/hostile/abnormality/greed_king,))
/mob/living/simple_animal/hostile/abnormality/greed_king,
/mob/living/simple_animal/hostile/abnormality/eris,))

//Used for the specific raidboss mode
GLOBAL_LIST_INIT(raidboss, list(/mob/living/simple_animal/hostile/distortion/shrimp_rambo/easy,
/mob/living/simple_animal/hostile/abnormality/mountain,
/mob/living/simple_animal/hostile/ordeal/black_fixer
))


//Split into 3 groups, Combat for damaging abnos, Support for ranged, AOE and otherwise support abnos, and tank for abnos that can take a beating reliably
/obj/effect/landmark/abnospawn/easycombat
Expand Down Expand Up @@ -116,3 +131,19 @@ GLOBAL_LIST_INIT(hardtank, list(/mob/living/simple_animal/hostile/abnormality/me
var/spawning = pick_n_take(GLOB.hardtank)
new spawning(get_turf(src))
return INITIALIZE_HINT_QDEL


/obj/effect/landmark/abnospawn/raidboss
name = "raidboss spawner"
desc = "It spawns an abno. Notify a coder. Thanks!"
icon = 'icons/effects/landmarks_static.dmi'
icon_state = "x2"

/obj/effect/landmark/abnospawn/raidboss/Initialize()
..()
var/spawning = pick_n_take(GLOB.raidboss)
new spawning(get_turf(src))
return INITIALIZE_HINT_QDEL

//To do: Deshit this.

45 changes: 45 additions & 0 deletions ModularTegustation/tegu_items/rcorp/medals.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/obj/item/clothing/accessory/medal/rcorp
name = "distinguished conduct medal"
desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is the most basic award given by R-Corp. \
It is often awarded by an officer to one of their soldiers for going above and beyond the call of duty."

/obj/item/clothing/accessory/medal/silver/rcorp
name = "medal of valor"
desc = "An award for distinguished combat and sacrifice for R-Corp interests. Often awarded to disciplinary soldiers."

/obj/item/clothing/accessory/medal/gold/rcorp
name = "medal of exceptional heroism"
desc = "An extremely rare golden medal awarded only by R-Corp Commanders to their soldiers. \
To receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but captains."


//Medal Boxes
/obj/item/storage/lockbox/medal/officer
name = "Captain's medal box"
desc = "A locked box used to store medals to be given to those exhibiting excellence in the field."
req_access = list(ACCESS_COMMAND)

/obj/item/storage/lockbox/medal/officer/PopulateContents()
new /obj/item/clothing/accessory/medal/rcorp(src)

/obj/item/storage/lockbox/medal/lcdr
name = "Lieutenant Commander's medal box"
desc = "A locked box used to store medals to be given to those exhibiting excellence in the field."
req_access = list(ACCESS_COMMAND)

/obj/item/storage/lockbox/medal/lcdr/PopulateContents()
for(var/i in 1 to 3)
new /obj/item/clothing/accessory/medal/rcorp(src)
new /obj/item/clothing/accessory/medal/silver/rcorp(src)

/obj/item/storage/lockbox/medal/cdr
name = "Commander's medal box"
desc = "A locked box used to store medals to be given to those exhibiting excellence in the field."
req_access = list(ACCESS_MANAGER)

/obj/item/storage/lockbox/medal/cdr/PopulateContents()
for(var/i in 1 to 3)
new /obj/item/clothing/accessory/medal/rcorp(src)
for(var/i in 1 to 2)
new /obj/item/clothing/accessory/medal/silver/rcorp(src)
new /obj/item/clothing/accessory/medal/gold/rcorp(src)
29 changes: 29 additions & 0 deletions ModularTegustation/tegu_items/rcorp/mobs.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
//These are mostly like basic zombies, something for R-Corp to cut through like butter.
/mob/living/simple_animal/hostile/sweeper
name = "Sweeper"
desc = "When night comes in the backstreets..."
icon = 'ModularTegustation/Teguicons/tegumobs.dmi'
icon_state = "sweeper_1"
icon_living = "sweeper_1"
speak_chance = 0
maxHealth = 100
health = 100
harm_intent_damage = 5
melee_damage_lower = 21
melee_damage_upper = 21
attack_verb_continuous = "cuts"
attack_verb_simple = "cut"
attack_sound = 'sound/effects/ordeals/indigo/stab_1.ogg'
a_intent = INTENT_HARM
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
status_flags = CANPUSH
del_on_death = 1

//Rcorp couldn't kill the first one with 2 whole platoons
/mob/living/simple_animal/hostile/distortion/shrimp_rambo/easy
maxHealth = 5000 //you asked for a star of the city
health = 5000
melee_damage_lower = 35
melee_damage_upper = 50
rapid = 25
Loading

0 comments on commit 192fdc4

Please sign in to comment.