cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2025-12-10 04:06:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

aaaaaaaaaaa 2

Browse Source
This commit is contained in:
lolman360
2021-02-15 17:30:11 +11:00
parent b2c88877be
commit ec7b308124
4 changed files with 35 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__DEFINES/dcs/signals.dm
View File

@@ -38,7 +38,7 @@
#define EXAMINE_POSITION_BEFORE 2
//End positions
#define COMPONENT_EXNAME_CHANGED 1
*/
///from base of atom/update_icon(): ()
#define COMSIG_ATOM_UPDATE_ICON "atom_update_icon"
#define COMSIG_ATOM_NO_UPDATE_ICON_STATE (1<<0)

2
code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm
View File

@@ -1,5 +1,5 @@
/datum/say_list/merc/unknown_ind
speak = list("One day the'll fix that damn engine..","Next time, We're hidding on the tropical beach planet.","Wish I had better equipment...","I knew I should have been a line chef...","Fuckin' helmet keeps fogging up.","Hate this blocky ass ship.")
speak = list("One day the'll fix that damn engine..","Next time, We're hiding on the tropical beach planet.","Wish I had better equipment...","I knew I should have been a line chef...","Fuckin' helmet keeps fogging up.","Hate this blocky ass ship.")
say_got_target = list("Looks like trouble!","Contact!","We've got company!","Perimeter Breached!!")
/mob/living/simple_mob/humanoid/merc/melee/sword/space

4
maps/RandomZLevels/labyrinth.dm
View File

@@ -185,7 +185,7 @@
do_after_cooldown()
return
/obj/effect/landmark/mobcorpse/tunnelclown
/obj/effect/landmark/corpse/tunnelclown
name = "dead tunnel clown"
corpseuniform = /obj/item/clothing/under/rank/clown
corpseshoes = /obj/item/clothing/shoes/clown_shoes
@@ -194,7 +194,7 @@
corpsemask = /obj/item/clothing/mask/gas/clown_hat
corpsepocket1 = /obj/item/bikehorn
/obj/effect/landmark/mobcorpse/tunnelclown/sentinel
/obj/effect/landmark/corpse/tunnelclown/sentinel
name = "dead clown sentinel"
corpsesuit = /obj/item/clothing/suit/cultrobes
corpsehelmet = /obj/item/clothing/head/culthood

75
vorestation.dme
View File

@@ -19,7 +19,6 @@
#include "code\names.dm"
#include "code\world.dm"
#include "code\z_compile_options.dm"
#include "code\__DEFINES\__513_compatibility.dm"
#include "code\__DEFINES\_globals.dm"
#include "code\__DEFINES\_lists.dm"
#include "code\__DEFINES\_planes+layers.dm"
@@ -47,6 +46,7 @@
#include "code\__DEFINES\inventory_storage.dm"
#include "code\__DEFINES\is_helpers.dm"
#include "code\__DEFINES\items_clothing.dm"
#include "code\__DEFINES\jobs.dm"
#include "code\__DEFINES\lighting.dm"
#include "code\__DEFINES\machinery.dm"
#include "code\__DEFINES\maps.dm"
@@ -271,6 +271,7 @@
#include "code\controllers\subsystems\transcore_vr.dm"
#include "code\controllers\subsystems\transfer.dm"
#include "code\controllers\subsystems\turbolift.dm"
#include "code\controllers\subsystems\vis_overlays.dm"
#include "code\controllers\subsystems\vote.dm"
#include "code\controllers\subsystems\xenoarch.dm"
#include "code\controllers\subsystems\persistence\_persistence.dm"
@@ -517,11 +518,10 @@
#include "code\game\area\ai_monitored.dm"
#include "code\game\area\areas.dm"
#include "code\game\area\areas_movement.dm"
#include "code\game\area\areas_vr.dm"
#include "code\game\area\asteroid_areas.dm"
#include "code\game\area\Away Mission areas.dm"
#include "code\game\area\Off Station Areas.dm"
#include "code\game\area\Space Station 13 areas.dm"
#include "code\game\area\Space Station 13 areas_vr.dm"
#include "code\game\area\ss13_deprecated_areas.dm"
#include "code\game\dna\dna2.dm"
#include "code\game\dna\dna2_domutcheck.dm"
@@ -803,7 +803,6 @@
#include "code\game\machinery\atmoalter\scrubber.dm"
#include "code\game\machinery\camera\camera.dm"
#include "code\game\machinery\camera\camera_assembly.dm"
#include "code\game\machinery\camera\camera_vr.dm"
#include "code\game\machinery\camera\motion.dm"
#include "code\game\machinery\camera\presets.dm"
#include "code\game\machinery\camera\tracking.dm"
@@ -994,7 +993,6 @@
#include "code\game\objects\items\shooting_range.dm"
#include "code\game\objects\items\toys.dm"
#include "code\game\objects\items\trash.dm"
#include "code\game\objects\items\trash_vr.dm"
#include "code\game\objects\items\devices\advnifrepair.dm"
#include "code\game\objects\items\devices\ai_detector.dm"
#include "code\game\objects\items\devices\aicard.dm"
@@ -1069,6 +1067,25 @@
#include "code\game\objects\items\stacks\sheets\leather.dm"
#include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles.dm"
#include "code\game\objects\items\stacks\tiles\tile_types.dm"
#include "code\game\objects\items\storage\_storage.dm"
#include "code\game\objects\items\storage\backpack.dm"
#include "code\game\objects\items\storage\bags.dm"
#include "code\game\objects\items\storage\belt.dm"
#include "code\game\objects\items\storage\bible.dm"
#include "code\game\objects\items\storage\boxes.dm"
#include "code\game\objects\items\storage\briefcase.dm"
#include "code\game\objects\items\storage\fancy.dm"
#include "code\game\objects\items\storage\firstaid.dm"
#include "code\game\objects\items\storage\internal.dm"
#include "code\game\objects\items\storage\laundry_basket.dm"
#include "code\game\objects\items\storage\lockbox.dm"
#include "code\game\objects\items\storage\misc.dm"
#include "code\game\objects\items\storage\mre.dm"
#include "code\game\objects\items\storage\quickdraw.dm"
#include "code\game\objects\items\storage\secure.dm"
#include "code\game\objects\items\storage\toolbox.dm"
#include "code\game\objects\items\storage\uplink_kits.dm"
#include "code\game\objects\items\storage\wallets.dm"
#include "code\game\objects\items\weapons\AI_modules.dm"
#include "code\game\objects\items\weapons\autopsy.dm"
#include "code\game\objects\items\weapons\barrier_tape.dm"
@@ -1191,25 +1208,6 @@
#include "code\game\objects\items\weapons\melee\energy_vr.dm"
#include "code\game\objects\items\weapons\melee\melee.dm"
#include "code\game\objects\items\weapons\melee\misc.dm"
#include "code\game\objects\items\weapons\storage\_storage.dm"
#include "code\game\objects\items\weapons\storage\backpack.dm"
#include "code\game\objects\items\weapons\storage\bags.dm"
#include "code\game\objects\items\weapons\storage\belt.dm"
#include "code\game\objects\items\weapons\storage\bible.dm"
#include "code\game\objects\items\weapons\storage\boxes.dm"
#include "code\game\objects\items\weapons\storage\briefcase.dm"
#include "code\game\objects\items\weapons\storage\fancy.dm"
#include "code\game\objects\items\weapons\storage\firstaid.dm"
#include "code\game\objects\items\weapons\storage\internal.dm"
#include "code\game\objects\items\weapons\storage\laundry_basket.dm"
#include "code\game\objects\items\weapons\storage\lockbox.dm"
#include "code\game\objects\items\weapons\storage\misc.dm"
#include "code\game\objects\items\weapons\storage\mre.dm"
#include "code\game\objects\items\weapons\storage\quickdraw.dm"
#include "code\game\objects\items\weapons\storage\secure.dm"
#include "code\game\objects\items\weapons\storage\toolbox.dm"
#include "code\game\objects\items\weapons\storage\uplink_kits.dm"
#include "code\game\objects\items\weapons\storage\wallets.dm"
#include "code\game\objects\items\weapons\tanks\jetpack.dm"
#include "code\game\objects\items\weapons\tanks\tank_types.dm"
#include "code\game\objects\items\weapons\tanks\tank_types_vr.dm"
@@ -1227,7 +1225,6 @@
#include "code\game\objects\random\mapping.dm"
#include "code\game\objects\random\misc.dm"
#include "code\game\objects\random\mob.dm"
#include "code\game\objects\random\mob_vr.dm"
#include "code\game\objects\random\spacesuits.dm"
#include "code\game\objects\random\unidentified\medicine.dm"
#include "code\game\objects\structures\barsign.dm"
@@ -1373,7 +1370,6 @@
#include "code\game\turfs\simulated\wall_types_vr.dm"
#include "code\game\turfs\simulated\walls.dm"
#include "code\game\turfs\simulated\water.dm"
#include "code\game\turfs\simulated\water_vr.dm"
#include "code\game\turfs\simulated\dungeon\floor.dm"
#include "code\game\turfs\simulated\dungeon\wall.dm"
#include "code\game\turfs\simulated\outdoors\atmoscaves_vr.dm"
@@ -1390,7 +1386,6 @@
#include "code\game\turfs\unsimulated\beach.dm"
#include "code\game\turfs\unsimulated\floor.dm"
#include "code\game\turfs\unsimulated\planetary.dm"
#include "code\game\turfs\unsimulated\planetary_vr.dm"
#include "code\game\turfs\unsimulated\shuttle.dm"
#include "code\game\turfs\unsimulated\sky_vr.dm"
#include "code\game\turfs\unsimulated\walls.dm"
@@ -1934,8 +1929,6 @@
#include "code\modules\fishing\fishing.dm"
#include "code\modules\fishing\fishing_net.dm"
#include "code\modules\fishing\fishing_rod.dm"
#include "code\modules\fishing\fishing_rod_vr.dm"
#include "code\modules\fishing\fishing_vr.dm"
#include "code\modules\flufftext\Dreaming.dm"
#include "code\modules\flufftext\Hallucination.dm"
#include "code\modules\flufftext\look_up.dm"
@@ -1957,7 +1950,6 @@
#include "code\modules\food\food\lunch.dm"
#include "code\modules\food\food\sandwich.dm"
#include "code\modules\food\food\snacks.dm"
#include "code\modules\food\food\snacks_vr.dm"
#include "code\modules\food\food\z_custom_food_vr.dm"
#include "code\modules\food\food\drinks\bottle.dm"
#include "code\modules\food\food\drinks\cup.dm"
@@ -2055,7 +2047,6 @@
#include "code\modules\hydroponics\seed.dm"
#include "code\modules\hydroponics\seed_controller.dm"
#include "code\modules\hydroponics\seed_datums.dm"
#include "code\modules\hydroponics\seed_datums_vr.dm"
#include "code\modules\hydroponics\seed_gene_mut.dm"
#include "code\modules\hydroponics\seed_machines.dm"
#include "code\modules\hydroponics\seed_mobs.dm"
@@ -2180,13 +2171,14 @@
#include "code\modules\mapping\space_management\space_transition.dm"
#include "code\modules\mapping\space_management\traits.dm"
#include "code\modules\mapping\space_management\zlevel_manager.dm"
#include "code\modules\maps\tether\atmospheres\classd.dm"
#include "code\modules\maps\tether\atmospheres\classh.dm"
#include "code\modules\maps\tether\atmospheres\frozen_planet.dm"
#include "code\modules\maps\tether\atmospheres\gaia_planet.dm"
#include "code\modules\maps\tether\atmospheres\lavaland.dm"
#include "code\modules\maps\tether\atmospheres\virgo2.dm"
#include "code\modules\maps\tether\atmospheres\virgo3b.dm"
#include "code\modules\maps\atmospheres\classd.dm"
#include "code\modules\maps\atmospheres\classh.dm"
#include "code\modules\maps\atmospheres\frozen_planet.dm"
#include "code\modules\maps\atmospheres\gaia_planet.dm"
#include "code\modules\maps\atmospheres\lavaland.dm"
#include "code\modules\maps\atmospheres\triumph.dm"
#include "code\modules\maps\atmospheres\virgo2.dm"
#include "code\modules\maps\atmospheres\virgo3b.dm"
#include "code\modules\maps\tg\dmm_suite.dm"
#include "code\modules\maps\tg\map_template.dm"
#include "code\modules\maps\tg\map_template_vr.dm"
@@ -2531,10 +2523,9 @@
#include "code\modules\mob\living\silicon\robot\subtypes\lost_drone.dm"
#include "code\modules\mob\living\silicon\robot\subtypes\lost_drone_vr.dm"
#include "code\modules\mob\living\silicon\robot\subtypes\syndicate.dm"
#include "code\modules\mob\living\simple_animal\corpse.dm"
#include "code\modules\mob\living\simple_animal\corpse_vr.dm"
#include "code\modules\mob\living\simple_mob\appearance.dm"
#include "code\modules\mob\living\simple_mob\combat.dm"
#include "code\modules\mob\living\simple_mob\corpse.dm"
#include "code\modules\mob\living\simple_mob\defense.dm"
#include "code\modules\mob\living\simple_mob\hands.dm"
#include "code\modules\mob\living\simple_mob\life.dm"
@@ -2564,11 +2555,9 @@
#include "code\modules\mob\living\simple_mob\subtypes\animal\giant_spider\webslinger.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\crab.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\fish.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\fish_vr.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\lizard.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\misc.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\mouse.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\mouse_vr.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\passive.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\penguin.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\pets\bird.dm"
@@ -2706,7 +2695,6 @@
#include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_subtypes.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\demon\~defines.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\morph\morph.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\_defines.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\ability_objects.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\ability_procs.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\shadekin.dm"
@@ -3320,7 +3308,6 @@
#include "code\modules\tooltip\tooltip.dm"
#include "code\modules\turbolift\_turbolift.dm"
#include "code\modules\turbolift\turbolift.dm"
#include "code\modules\turbolift\turbolift_areas.dm"
#include "code\modules\turbolift\turbolift_console.dm"
#include "code\modules\turbolift\turbolift_door.dm"
#include "code\modules\turbolift\turbolift_door_vr.dm"