shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,706 Commits 5 Branches 0 Tags
54107e4090003c0bee65d4142fa4a7ccdca08a38
Commit Graph

2664 Commits

Author SHA1 Message Date
LetterJay
a7b3516491 Merge pull request #2000 from Citadel-Station-13/upstream-merge-29228 
[MIRROR] Fixes IV Drips
 2017-07-19 05:02:19 -05:00
LetterJay
5e8bee0d9b Merge pull request #2062 from Citadel-Station-13/upstream-merge-29313 
[MIRROR] Adds a move delay when resisting out of cryo
 2017-07-19 05:00:03 -05:00
LetterJay
14461521f8 Merge pull request #2058 from Citadel-Station-13/upstream-merge-29305 
[MIRROR] Fixes carbons not handling the Blood-Drunk status effect properly
 2017-07-19 04:59:30 -05:00
LetterJay
11772ffa74 Merge pull request #2057 from Citadel-Station-13/upstream-merge-29299 
[MIRROR] Prevents the anomalous crystal from making fantasy into reality
 2017-07-19 04:59:02 -05:00
LetterJay
b497ce09ab Update iv_drip.dm 2017-07-19 04:52:47 -05:00
LetterJay
98c2128386 Merge pull request #2052 from Citadel-Station-13/remove 
removes the 'yiff in hell' graffiti artwork
 2017-07-19 04:46:09 -05:00
LetterJay
0eacb2c7a8 Merge pull request #2051 from ktccd/Borer-lewds 
Borer lewds
 2017-07-19 04:45:53 -05:00
CitadelStationBot
20070c370c Adds a move delay when resisting out of cryo 2017-07-18 09:43:34 -05:00
CitadelStationBot
c294d781b6 Fixes flashbang stun times (#2056) 2017-07-18 06:14:29 -07:00
CitadelStationBot
665e1f2e8e Unprotects the deadmin list (#2059) 2017-07-18 06:14:19 -07:00
CitadelStationBot
8d9dc6dd13 [MIRROR] Fixes a ... likely important bug with shuttle code.... (#2061) 
* Fixes a ... likely important bug with shuttle code....

* Delete turf.dm.rej

* Update turf.dm
 2017-07-18 06:01:02 -07:00
CitadelStationBot
556a8b7216 Unbreaks turf.empty (#2053) 2017-07-18 05:58:27 -07:00
ktccd
6aeb096054 Updates epinephrine flufftext 
Updating with less specific epinephrine flufftext.
 2017-07-18 14:43:39 +02:00
CitadelStationBot
d99d886aa4 Fixes carbons not handling the Blood-Drunk status effect properly 2017-07-18 06:46:06 -05:00
CitadelStationBot
228f539eca Prevents the anomalous crystal from making fantasy into reality 2017-07-18 06:46:00 -05:00
LetterJay
2d096997bc removes the 'yiff in hell' graffiti artwork 2017-07-18 05:25:38 -05:00
ktccd
0a6deecb86 Somehow this didn't get in? 
Added camphor also, it was supposed to have been committed already, dang
git-magic!
 2017-07-18 11:13:56 +02:00
ktccd
aa049ce481 Adding citadel chems and flufftext 
Aphrodisiac and Anaphrodisiac added to borer chem list. Now that TG
removed borers, maybe they'll stay on this time.
Also added flufftext for borer_chems, so that there is some kind of
feedback to the host when their borer puts something in them. I'm not
sure what span class should be used, but the chem is usually beneficial
and the only chem that might be dangerous (meth) is not very subtle as
to miss it just because the span class...

Also added snowflake exception for citadel chem flavor text, because
some people/species cannot feel arousal and thus would not notice the
chemical having any effect.
 2017-07-18 10:56:31 +02:00
CitadelStationBot
e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07:00
CitadelStationBot
bbc28aa856 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049) 2017-07-17 22:51:51 -07:00
CitadelStationBot
b2c8115ca5 Winter coats now properly hold flashlights (#2043) 2017-07-17 22:51:14 -07:00
deathride58
d21260d480 Makes arousal meter invisible when arousal is disabled (#2028) 
* makes arousal meter invisible when arousal is disabled

* sets the appearance of the arousal meter when the hud is generated

* hm

* hopefully fixed

* cmon

* okay NOW it works. it 100% works
 2017-07-17 22:50:52 -07:00
LetterJay
fbeebdeab9 Merge pull request #2027 from ktccd/Enable-Borer-Random-Event 
Enable borer random event
 2017-07-17 07:46:01 -05:00
LetterJay
62648534cb Merge pull request #2046 from Citadel-Station-13/upstream-merge-29274 
[MIRROR] Minor instrument code cleanup
 2017-07-17 07:41:59 -05:00
LetterJay
07a3dbea04 Merge pull request #2047 from Citadel-Station-13/upstream-merge-29291 
[MIRROR] Fixes the Ark not pushing stuff away even while waiting for components
 2017-07-17 07:41:42 -05:00
LetterJay
61640eaf72 Merge pull request #2048 from Citadel-Station-13/upstream-merge-29284 
[MIRROR] [s] Fixes goonchat cookie false positives
 2017-07-17 07:41:29 -05:00
CitadelStationBot
9c76e88952 [s] Fixes goonchat cookie false positives 2017-07-17 07:18:00 -05:00
CitadelStationBot
74e5f80257 Fixes the Ark not pushing stuff away even while waiting for components 2017-07-17 07:16:55 -05:00
CitadelStationBot
c94e598b3f Minor instrument code cleanup 2017-07-17 07:14:50 -05:00
CitadelStationBot
956f10f2d2 [s]Fixes panic bunker 2017-07-17 07:13:45 -05:00
CitadelStationBot
6f7e908c89 RPDs can now place disposals pipes on dense non-wall turfs (#2035) 2017-07-17 00:54:17 -07:00
CitadelStationBot
7a0c43e492 Makes GetAllContents faster. (#2036) 2017-07-17 00:53:50 -07:00
CitadelStationBot
3066f32215 Improves drone detonation logging (#2037) 2017-07-17 00:53:00 -07:00
CitadelStationBot
260a140f97 Ports instruments from /VG/station, including harmonicas, xylophones, saxophones, trombones, and a BIKE HORN. Repaths instruments to sound/instruments. Also, allows piano synth to play all instruments but eguitar and gives cargo a crate with everything. Clown gets the bike horn trumpet at roundstart. (#2034) 2017-07-17 00:52:43 -07:00
LetterJay
344dc1a061 Merge pull request #2032 from Citadel-Station-13/upstream-merge-29257 
[MIRROR] Fixes monkeys trying to take offhands
 2017-07-15 23:19:59 -05:00
LetterJay
c3857fe264 Merge pull request #2031 from Citadel-Station-13/upstream-merge-29269 
[MIRROR] Fixes missiles being able to ricochet
 2017-07-15 23:19:41 -05:00
LetterJay
44473643bb Merge pull request #2029 from Citadel-Station-13/upstream-merge-29267 
[MIRROR] Makes round end delay message optional
 2017-07-15 23:19:08 -05:00
LetterJay
8d31153fdc Merge pull request #2005 from Citadel-Station-13/upstream-merge-29223 
[MIRROR] Organ Update [Cloning isn't broken edition]
 2017-07-15 23:18:53 -05:00
CitadelStationBot
f634966a34 Fixes monkeys trying to take offhands 2017-07-15 22:33:14 -05:00
CitadelStationBot
a4d968ec82 Fixes missiles being able to ricochet 2017-07-15 22:31:05 -05:00
CitadelStationBot
2cbfec38a2 Makes round end delay message optional 2017-07-15 22:19:46 -05:00
ktccd
f87046aaee Comments 2017-07-15 23:44:13 +02:00
ktccd
accc12103c Enables Random borer event 
Enables the borer event, from max 0 occurances to max 1 occurance per
round.
Decreases random chance weight of borer event, from 15 down to the
default 10.
Increases minimum players required up from 15 to 20, as the gamemode at
MINIMUM requires 10 living players to greentext anyway and does poorly
on very lowpop rounds.
Earliest start increased from 20 minutes to 40 minutes, as our rounds
lasts longer than TG rounds do.
 2017-07-15 23:44:04 +02:00
CitadelStationBot
d21766956e [MIRROR] Cleaned up some emag_acts (#2018) 
* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm
 2017-07-15 13:17:56 -07:00
cebutris
099b908d64 Fixes traitor holoparasites (#1904) 
* fixes holoparasites

* adds #1051 and #1066

* as it turns out I'm blind

* fixes line 500 indentation
 2017-07-15 11:48:56 -07:00
CitadelStationBot
b025182955 Possibly fix player_list sometimes having a null (#2022) 2017-07-15 11:45:33 -07:00
CitadelStationBot
b2f20fffd8 Fixes timestop! (and tweaks its sounds) (#2019) 2017-07-15 11:45:11 -07:00
CitadelStationBot
62180f8953 ClickCross now uses CanPass instead of density directly. (#2016) 2017-07-15 11:44:36 -07:00
LetterJay
dcf957f0b2 adds icons for PDAs by Cecily and the hunter hat (#2015) 
* adds icons for PDAs by Cecily and the hunter hat

* Update cit_hats.dm
 2017-07-15 11:44:26 -07:00
CitadelStationBot
54da14ea6b Rename Bumped to CollidedWith (#2017) 2017-07-15 11:44:12 -07:00