cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,460 Commits 8 Branches 0 Tags
6d1258bc11a61dc6cfafa15fb8b7dacbd17f44bc
Commit Graph

1043 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
daefe0ba5b Why were these still here 2019-10-06 14:19:08 -04: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
70a2fa937c Merge remote-tracking branch 'upstream/master' 2019-06-05 00:25:36 +01:00
Novacat
ae42be4d56 Update supply.dm 2019-06-04 13:28:12 -04:00
Atermonera
8e215ec10f Allows supplypacks with req_one_access to exist 2019-06-04 13:15:14 -04:00
Hawk_v3
7bb9c92c9a Merge remote-tracking branch 'upstream/master' 2019-06-03 12:31:48 +01:00
Heroman3003
316f4754cb Fixes restriction 2019-05-28 12:42:15 +10: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
Novacat
e14cbd5aa5 Merge pull request #5161 from Novacat/nova-heterochromia 
Miscellaneous Fixes
 2019-05-02 03:56:26 -04:00
Heroman
ff9e4f2e4a Makes Flavor Text properly required for joining 2019-05-02 14:40:13 +10:00
Unknown
34457953cb Ports https://github.com/PolarisSS13/Polaris/pull/6147 2019-05-01 20:55:25 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Novacat
ad3e9fc6bd Merge pull request #5101 from Heroman3003/timeclock-finishing 
Implements switching on/off duty midround via timeclock terminals
 2019-04-25 21:11:07 -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
Atermonera
6cb44efd10 Merge pull request #6114 from Neerti/gamemode_config 
Makes gamemode player requirements be able to be overridden in the config
 2019-04-22 14:33:38 -04:00
Neerti
40e5fda9ca Adds Config-Controlled Automated Solar Setup (#6107) 
* Fixes autostart solars, adds new config-controlled solars.

* Tweaks map to use config-controlled solar panels, and makes it work.

* If true, Neerti finishes comment.
 2019-04-21 03:34:25 -04:00
Heroman3003
1a9cdecb32 Finishes timeclock duty switching functionality 2019-04-19 10:28:38 +10: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
629748faec Merge pull request #5048 from VOREStation/upstream-merge-6065 
[MIRROR] Allows restriction of z-levels from spawning xenoarch finds
 2019-04-14 03:08:41 -04: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
Neerti
2203f368e8 Merge pull request #6037 from Heroman3003/report-the-crate-cost-lazy-central-interns 
Fixes export reports not mentioning crates' cost
 2019-04-14 02:28:02 -04:00
Heroman
82b9508b0e Makes nanoui apply properly to roundstart clients 2019-04-12 16:18:54 +10:00
Dwaggy
4e6db4ad04 Change to configuration.dm 
-Enabled the recent change to AI control, allowing them to *actually* take over the remote AI_Shell made borgs
(currently this feature exists, shells can be made. but the AI got no verb to take over. leaving them forever a husk)
this allows them to double click a borg with the AI_Shell component installed in to it and take over control
Not entirely sure why this is.. only half-enabled by default. especially when they totally deleted the ability to also make/control the small engineering drones.
 2019-04-12 06:54:48 +01: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