Commit Graph

3694 Commits

Author SHA1 Message Date
LetterJay
8a174f8a76 Update damage_procs.dm 2017-07-31 06:24:52 -05:00
LetterJay
dc9c53ae0a Update combat.dm 2017-07-31 06:13:00 -05:00
LetterJay
ac9c24dfe5 Update combat.dm 2017-07-31 05:53:58 -05:00
LetterJay
c38fe60fc4 Update damage_procs.dm 2017-07-19 13:36:43 -05:00
LetterJay
cd0845bcd8 Update damage_procs.dm 2017-07-19 13:34:20 -05:00
LetterJay
96179eded8 Update combat.dm 2017-07-19 13:32:38 -05:00
CitadelStationBot
1ebdf19cdb Refactor Lung Handling 2017-07-18 09:59:09 -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
LetterJay
fa9e1577ec Fix missing PDA icons 2017-07-18 01:14:09 -05:00
CitadelStationBot
b29641d23e [Meta] Minor Whiteship Edits (#2042) 2017-07-17 22:55:42 -07:00
CitadelStationBot
01cb8d9e0f Automatic changelog generation for PR #2040 [ci skip] 2017-07-18 00:52:19 -05: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
7a173b95ed Automatic changelog generation for PR #2043 [ci skip] 2017-07-18 00:51:15 -05:00
CitadelStationBot
b2c8115ca5 Winter coats now properly hold flashlights (#2043) 2017-07-17 22:51:14 -07:00
CitadelStationBot
8aab67f825 Automatic changelog generation for PR #2028 [ci skip] 2017-07-18 00:50:54 -05: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
CitadelStationBot
df1d5fbc71 Automatic changelog generation for PR #2027 [ci skip] 2017-07-17 07:46:02 -05: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
CitadelStationBot
8a016adc0a Automatic changelog generation for PR #2047 [ci skip] 2017-07-17 07:41:44 -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
LetterJay
97484e175a Merge pull request #2045 from Citadel-Station-13/upstream-merge-29289
[MIRROR] [s]Fixes panic bunker
2017-07-17 07:25:39 -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
CitadelStationBot
2ea1fff7f3 Automatic changelog generation for PR #2031 [ci skip] 2017-07-15 23:19:43 -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
638213b2c2 Merge pull request #2030 from Citadel-Station-13/upstream-merge-29270
[MIRROR] Cleaned up duped vars
2017-07-15 23:19:26 -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
CitadelStationBot
e6fbba5404 Automatic changelog generation for PR #2005 [ci skip] 2017-07-15 23:18:54 -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
d286ed197e Cleaned up duped vars 2017-07-15 22:28:58 -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