cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 22:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,570 Commits 13 Branches 0 Tags
d76589b9e99fa5f526190a948459c65039fd0ab9
Commit Graph

121 Commits

Author SHA1 Message Date
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Aronai Sieyes
893130bdff Merge nutrition refactor for vorestation 2020-04-29 18:34:22 -04:00
ShadowLarkens
1d655268a4 Fixed merge conflicts and errors, everything seems to work 2020-04-23 18:25:25 -07:00
Novacat
6be827498b Merge pull request #7276 from KasparoVy/hack-me-back-in-time 
Adjusts Hacking of NIFSoft Vendor, Resolves #1761
 2020-04-19 23:44:37 -04:00
KasparoVy
33f39eccce Fixes Emaggery 
You can re-emag the vendor if either the access || contraband restrictions were fixed.
 2020-04-18 16:29:21 -04:00
KasparoVy
1d8315c8d9 Prevents Hacking for Contraband, Enables Contraband by Emag 
Implements logic to dictate unique behaviours of hacking & emagging such that...

1. You can't hack wires to enable contraband-- though you can disable it!
2. The only way to get contraband from the nifsoft shop is by emagging, which is now possible.
 2020-04-18 02:42:31 -04:00
Repede
e44e346352 Release Update 
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
 2020-04-16 21:07:33 -04:00
Aronai Sieyes
2289e8d177 Fix protean observe runtime 2020-04-15 18:51:55 -04:00
KasparoVy
a47693dfa7 Fixes Hacking of NIFSoft Vendor 
Hacking the NIFSoft vendor by pulsing the ID scan wire now behaves like other vendors, allowing you to unlock ID restriction on the various NIFSofts.

Issue & solution documented in #1761
 2020-04-15 17:48:54 -04:00
Aronai Sieyes
b28f08de4d VS: NIF crew monitor update 2020-04-12 22:53:18 -04:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
Unknown
dca2e93209 VS: Conflict Resolution + VS Changes 
Makes soft vendors work again
Conflict Resolution II
Fixes Shelter Capsule Vendor
Note to self remember quotations
Bad Lynx stop forgetting quotes!
 2020-03-31 13:56:38 -04:00
Leshana
1da5dd8230 Fix Runtime in unsorted.dm,1321: CANARY: Old human update_icons was called. 
At least the case of it being called from /datum/nifsoft/sizechange
No need to call update_icons() or even update_transform() because resize() does it for us.
 2020-03-30 17:17:26 -04:00
Aronai Sieyes
1c38bd11ca VR Cloaking framework 2020-03-23 21:34:32 -04:00
Novacat
59f30b2225 Update nif.dm 2020-03-19 22:23:46 -04:00
Sebbe
28888f821e removes the vorestation edit 2020-03-03 16:50:13 +01:00
Sebbe
34062be000 Deletes nerf and makes Bioadaptive 100 
stop no fun allowed polaris, ur no fun >:c
 2020-03-03 09:26:19 +01:00
Repede
c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
 2020-03-01 12:35:52 -05:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Arokha Sieyes
98a0f384f2 VS: NIF Category for VChat 2020-02-19 19:55:02 -05:00
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
lbnesquik
59e905a450 Disable blackouts from the potential effects of NIF instalation and extend the timer by 5 minutes as a counterbalance. 2020-01-13 07:22:34 +01:00
Hawk_v3
a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00:00
Repede
ecb31d04e0 Merge branch 'master' into master 2019-12-22 11:51:38 -05:00
Shadow-Quill
07f92de49a Belly Fixed 2019-12-22 00:40:58 -06:00
Shadow
be37badee2 Ding Ding Dong 2019-12-22 00:17:16 -06:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Arokha Sieyes
007fda1bc1 Fix nifsoft vendor runtime 
Caused by the vendor attempting to throw intangible software at people either due to wires cut or vendor virus.
 2019-12-14 13:57:52 -05:00
Verkister
9319b62bd1 Some runtime spam fixes. Also fixes fake AO. 
-Fixes several instances of runtime spam caused by lack of sanity checks in nifsoft procs.
-Fixes a runtime spam caused by 512>513 transition having renamed a fake ao filter argument.
-This also fixes the fake ao.
 2019-12-14 11:12:41 +02:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
Rykka
5219c1f97f Stage only files without broken filediff 2019-10-28 15:39:32 -06:00
Hawk_v3
691a1239f4 Merge from Vorestation 2019-09-29 21:53:09 +01:00
Verkister
6fad3f9e02 Fixes soulcatcher gender runtime spam 
Soulcatchers were trying to periodically backup the caught mind but stumbling into runtimes because the mind backups were relying on humanmob exclusive gender var that the brainmobs did not have.
 2019-09-28 21:40:53 +03:00
Cebutris
6db6d6f0c7 deletes more KHI, reworks some wording and other corps 2019-09-14 15:13:11 -04:00
Hawk_v3
96b8a7ab95 Merge remote-tracking branch 'upstream/master' 2019-08-17 21:06:48 +01:00
Michiyamenotehifunana
1e34c97a9a Turns NIFSoft disks into neuromods 2019-08-13 14:02:36 +08:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
 2019-04-07 19:40:12 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Unknown
a50eb67327 Updates for newest revision 2019-03-29 10:25:11 -04:00
Novacat
cf7f1f8198 Merge branch 'master' into nova-heterochromia 2019-03-29 10:20:26 -04:00
Novacat
0d338f8c45 Merge pull request #4647 from Novacat/nova-ert 
Adds Alarm monitor NIF program
 2019-03-29 10:12:01 -04:00
Unknown
2c91a108c4 Removes Security NIF Monitor 2019-03-29 09:50:28 -04:00
Unknown
ec19a66eff Conflict Resolution 2019-03-27 16:36:41 -04:00
Unknown
03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00