cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-25 01:22:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,732 Commits 7 Branches 0 Tags
5b51a657d42228f559d974c8fc20b0ee18c6456d
Commit Graph

237 Commits

Author SHA1 Message Date
Razgriz
76db71050c MW4 BB sounds 
Bitching betty sounds from MW4 for synth medichines
 2020-10-08 14:15:06 -07:00
Razgriz
d864dca92b HEV sound code 2020-10-08 13:32:48 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
ShadowLarkens
1cd53493fd Icons for NIFSoft Boxes 2020-09-25 04:40:32 -07:00
ShadowLarkens
bff1c92997 TGUI Communicators 2020-09-17 07:27:14 -07:00
ShadowLarkens
26c295bfb4 TGUI NIFs 2020-09-17 06:40:33 -07:00
ShadowLarkens
c32f05e1f7 TGUI Civilian 
UI's Converted:
 - Aurora Cooking
 - Chaplain Book Selection
 - ColorMate
 - Cryo Storage
 - Holodeck
 - Jukebox
 - Looking Glass
 - Microwave
 - Newscasters
 - Timeclock
 - Vending Machine Improvements
 2020-09-02 13:32:42 -07:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
ShadowLarkens
951f37d2e3 TGUI Engineering: Squashed Edition (Commits Below) 
TGUI APCs

 TGUI vending machines

 Fix AI default_tgui_interaction

 TGUI Airlocks

 Station & Atmospheric Alert TGUI + Misc NTOS-TGUI Fixes

 TGUI Air Alarms & Central Atmospheric Control

 Airlock TGUI

 TG... got rid of UI for fire alarm. í´·

 TGUI Gas Heating/Cooling System

 TGUI Gas Pump & Passive Gate + Fixes

 TGUI Omni Atmospherics

 TGUI Pipe Dispensers & RPD

 TGUI IntelliCore & Vending Fix

 TGUI Handheld Tanks

 TGUI Portable Pump & Scrubber

 TGUI Tank Dispenser & Canisters

 TGUI Radios

 TGUI SMES & Air Alarm adjustment

 Tweak vending machine interfaces a tad

 TGUI Algae Farm

 TGUI general_air_control

 - Distro & Waste Console
 - Riot Control Console
 - Atmos Intake Console
 - Engine Cooling Console

 TGUI Heavy Scrubber Control (and body scanner fix)

 TGUI trinary devices & shutoff monitor

 TGUI Telecomms Log Browser

 TGUI Telecomms Machine Browser

 TGUI Spaceheater Internal Panel

 TGUI Gravity Generator

 TGUI Id Cards & Fix ID Card Images

 TGUI Id Card Redesign

 TGUI Turbolift

 TGUI Suit Cycler & Suit Storage Unit & Vending Fixes

 TGUI Power Monitor

 TGUI Signalers

 TGUI Employment Records

 TGUI Drone Console

 TGUI RIGSuits

 TGUI PA & PACMAN, and Margin Fix

 TGUI Solar Panels & Fix Power Monitor

 Adjust TGUI modules & their interaction with NTOS

 TGUI RCON

 TGUI Message Monitor

 Bump TGUI line limit to 120 (ParadiseSS13/Paradise#14002)

 TGUI Exonet & NTNet Relay

 TGUI Telecomms Multitool Menu

 TGUI Shield Capacitor & Shield Generator

 TGUI Supermatter-everything & Refactors
 2020-08-09 04:46:31 -07:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
ShadowLarkens
3ea0e50432 Port TGUI Wire datums (ParadiseSS13/Paradise#13769) 2020-07-22 00:23:58 -07:00
ShadowLarkens
2992efb823 TGUI v4.0 2020-07-17 22:09:26 -07:00
ShadowLarkens
a1eb54e615 Convert all old nano_module crew monitors to TGUI, fix crew monitor for virgo 2020-07-16 18:58:37 -07:00
Razgriz
d500aa1c66 Remove NIF savetofile 
Long shot, but in hopes of fixing a crashing bug involving NIF info saving to character file
 2020-07-15 19:46:01 -07:00
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