cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,647 Commits 10 Branches 0 Tags
c11c37514c52a25efabc9c5f3a973be40179a2c5
Commit Graph

200 Commits

Author SHA1 Message Date
izac112
6d1258bc11 Edit 2019-11-19 22:58:59 +01:00
izac112
f43601eecd Changes it from "an additional hour" to "an additional four hours" 2019-11-19 22:55:33 +01:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
DigitalSquirrel95
30f751b23f Update vote.dm 2019-10-11 02:29:58 -04:00
DigitalSquirrel95
bec4591556 Changes the crew transfer message to be more IC friendly. 
A simple change that changes the crew transfer vote message to something that implies the crew is voting for extra work on their PDAs.  This makes the crew transfer make a bit more sense in character, because as it stands, our characters are currently coming to work not really knowing when they get off work.

Direct port of this: https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/572
 2019-10-11 01:43:00 -04:00
Hawk_v3
2cc8800ede Merge remote-tracking branch 'upstream/master' 2019-10-08 15:14:36 +01:00
Unknown
dade2aa80b Conflict Resolution 2019-10-06 13:12:11 -04:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Hawk_v3
6d4ec50e08 Merge remote-tracking branch 'upstream/master' 2019-09-01 19:02:01 +01:00
Unknown
975d879433 Minor Fixes Part two 
- Ion Spiders now use a weaker ion projectile
- Garbage collection now only complains if it takes longer than two seconds
 2019-08-30 20:29:02 -04:00
Hawk_v3
7bb9c92c9a Merge remote-tracking branch 'upstream/master' 2019-06-03 12:31:48 +01:00
Unknown
04341df092 Timer SS Fix Part two 
Update of Polaris PR
 2019-05-27 01:02:39 -04:00
Unknown
d13e8ee784 Critical Fixes 
- Fixes HREF Exploit
- Replaces Timer Subsystem with a Bay port in a desperate attempt to fix the timer SS crashes
- Port of https://github.com/PolarisSS13/Polaris/pull/6180 and https://github.com/PolarisSS13/Polaris/pull/6178
- Fixes #5272
 2019-05-26 23:58:56 -04:00
Hawk_v3
3aa4e406f9 Merge remote-tracking branch 'upstream/master' 2019-05-15 14:46:50 +01:00
Novacat
69d1e97d2e Update character_setup.dm 2019-05-13 22:43:00 -04:00
Neerti
318a2f3d09 Ports character setup subsystem from Bay. 2019-05-13 22:39:52 -04:00
Heroman3003
6f80f45eed Ports character setup subsystem 2019-05-14 11:48:34 +10:00
Hawk_v3
470c86fb45 Merge remote-tracking branch 'upstream/master' 2019-05-08 19:59:55 +01:00
Novacat
909a44ff4c Update nanoui.dm 2019-05-05 14:17:36 -04:00
Atermonera
1757c30075 Ports #6039 with Virgo Fixes 2019-05-05 14:14:37 -04:00
Hawk_v3
27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Neerti
9c6886395a Merge pull request #6118 from Novacat/nova-alerts 
Ports Baystation's SS Debugging
 2019-04-25 17:03:43 -04:00
Hawk_v3
5f92049ed7 Yeah no, we like our long rounds. 
Minimal changes to code.
 2019-04-22 21:05:56 +01:00
Hawk_v3
50e2482613 Merge remote-tracking branch 'upstream/master' 2019-04-22 20:12:14 +01:00
Novacat
557a36e2e5 Conflict Resolution 2019-04-18 13:47:28 -04:00
Atermonera
7f97c8e7cc Makes transfer always occur if nobody is playing. 2019-04-18 13:45:57 -04:00
Heroman
bc74ea53c9 Removes Command from appearing for players who had it removed 2019-04-15 18:14:04 +10:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Novacat
36e7814477 Update xenoarch.dm 2019-04-14 02:51:07 -04:00
Neerti
49628739b2 Allows restriction of z-levels from spawning xenoarch finds 2019-04-14 02:29:17 -04:00
Heroman
82b9508b0e Makes nanoui apply properly to roundstart clients 2019-04-12 16:18:54 +10:00
Novacat
af4b960d8e Merge pull request #4996 from Heroman3003/safety-first 
Fixes xenoarch spawning on station levels
 2019-04-11 15:56:14 -04:00
Heroman3003
95b2c63b85 Allows restriction of Z-levels for xenoarch spawning 2019-04-11 09:55:06 +10:00
Novacat
552cafdb47 Merge pull request #4970 from Novacat/nova-ert 
Emergency Chemistry/NanoUI/Timer subsystem fixes
 2019-04-10 19:39:51 -04:00
Unknown
cecbac2831 Emergency fix to Timer Subsystem 2019-04-10 18:53:15 -04:00
Heroman3003
b85d43bc21 Allows ghosts with backups to ping medical again 2019-04-09 10:28:55 +10:00
Unknown
dcd2a1f606 Ports Chemistry/NanoUI Fixes Early 
Direct port of https://github.com/PolarisSS13/Polaris/pull/6039
 2019-04-08 16:15:29 -04:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Heroman
032daec451 Removes collection of command PTO 2019-04-08 15:10:58 +10: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
Novacat
0b71310df5 Merge pull request #4732 from VOREStation/upstream-merge-5909 
[MIRROR] AFK Kicker stores AI cores
 2019-03-28 17:25:22 -04:00
Novacat
b004d7d847 Merge pull request #4721 from VOREStation/upstream-merge-5901 
[MIRROR] Unclogs powersink drains
 2019-03-28 15:49:58 -04:00
Unknown
5e6e193fb3 Rebases this correctly 2019-03-28 15:24:27 -04:00
Novacat
56752a1337 Merge branch 'master' into upstream-merge-5901 2019-03-28 14:37:02 -04:00
Neerti
3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -04:00
Novacat
dce3466f3b Merge pull request #4684 from VOREStation/upstream-merge-5814 
[MIRROR] [READY]Makes a bunch of processes subsystems instead
 2019-03-27 17:46:31 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Neerti
fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00