shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,723 Commits 5 Branches 0 Tags
4136be0361cd5a30ca0b26b2fd39a2fa0f8671dd
Commit Graph

546 Commits

Author SHA1 Message Date
LetterJay
4136be0361 Merge pull request #3558 from Citadel-Station-13/upstream-merge-31978 
[MIRROR] Cleans up datum traitor minimally.
 2017-10-23 14:50:05 -04:00
LetterJay
82d02050cd Merge pull request #3547 from Citadel-Station-13/upstream-merge-31989 
[MIRROR] Fixes silicon mob contents becoming contaminated
 2017-10-23 03:35:35 -04:00
AnturK
0faee43f95 Cleans up datum traitor minimally. (#31978) 
* Removes the /custom traitor subtype nonsense.
Fixes borged/ai'zed traitors getting law 0.

* Not needed anymore
 2017-10-22 17:44:55 -05:00
oranges
bc5c548e9b Merge pull request #31989 from ninjanomnom/radiation-borg-fix 
Fixes silicon mob contents becoming contaminated
 2017-10-21 22:22:01 -05:00
MoreRobustThanYou
637273285d Blood Brother now properly sets special role (#31964) 
* Blood Brother now properly sets special role

* Update mob_helpers.dm

* Update mob_helpers.dm

* Update mob_helpers.dm
 2017-10-21 20:15:49 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
CitadelStationBot
d511bc1fde [MIRROR] Fixes bombs on Reebe being an instant win (#3518) 
* Fixes bombs on Reebe being an instant win (#31503)

* Probably reduces Reebe bombcap

* wat

* TTV warning

* Less awkward wording

* Fixes bombs on Reebe being an instant win
 2017-10-21 03:47:07 -05:00
CitadelStationBot
0ad6e36727 [MIRROR] Apprentice fixes (#3533) 
* Apprentice fixes (#31880)

* Fixes apprentices summoning for non-wizards

* Fixes admin antaghud not showing for solo wizards

* Apprentice fixes
 2017-10-21 03:44:21 -05:00
CitadelStationBot
c0e00ab5ca [MIRROR] [s] Fixes datum antag is_banned (#3523) 
* Fixes datum antag jobbans (#31901)

* [s] Fixes datum antag is_banned
 2017-10-20 12:48:15 -05:00
CitadelStationBot
b044758315 [MIRROR] Fixes a parrot posession runtime (#3516) 
* Fixes a parrot posession runtime (#31879)

* Fixes a parrot posession runtime
 2017-10-20 01:41:28 -05:00
LetterJay
e876293476 Merge pull request #3499 from Citadel-Station-13/upstream-merge-31773 
[MIRROR] Showers clean contamination and make sound
 2017-10-19 09:20:02 -04:00
Emmett Gaines
ee3d18fe58 Showers clean contamination and make sound (#31773) 
* fucking showers

* cleanup
 2017-10-19 03:29:08 -05:00
Emmett Gaines
04d26d561a Radiation makes you vomit blood and more balance changes (#31753) 2017-10-18 09:25:11 -05:00
LetterJay
250f55e072 Merge pull request #3477 from Citadel-Station-13/upstream-merge-31630 
[MIRROR] Datum rev & related upgrades to base datum antag
 2017-10-18 07:42:54 -04:00
LetterJay
f4faabc87c Update mind.dm 2017-10-18 06:27:40 -05:00
AnturK
2ecb4c216c Datum rev & related upgrades to base datum antag 2017-10-18 02:26:11 -05:00
Leo
28656d3347 Merge pull request #31809 from ShizCalev/helper-cleanup 
Cleans up some istypes not using helpers
 2017-10-17 19:21:14 -05:00
LetterJay
5ae1b16d6c Update airlock.dm 2017-10-16 20:52:19 -05:00
Leo
416816cd5f Add a safety check for usr in airlock shocking 2017-10-16 16:48:21 -05:00
AnturK
c85e760eac Fixes apprentices in check antags/roundend list 2017-10-16 12:46:20 -05:00
LetterJay
568ed91f28 Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599 
[MIRROR] Moves projectile processing to a subsystem
 2017-10-16 10:39:41 -04:00
LetterJay
3160051499 Merge pull request #3425 from Citadel-Station-13/upstream-merge-31735 
[MIRROR] Fixes emotes not checking the right turf (or any turf for that matter)
 2017-10-16 07:28:13 -04:00
LetterJay
e4d2609800 Merge pull request #3420 from Citadel-Station-13/upstream-merge-31665 
[MIRROR] Adds logging crew manifest to seperate file
 2017-10-16 07:28:03 -04:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
Jordan Brown
814bf72d66 Fixes emotes not checking the right turf (or any turf for that matter) (#31735) 
* Fixes emotes not checking the right turf (or any turf for that matter)
 2017-10-15 19:41:01 -05:00
AnturK
64b1be05ff Adds logging crew manifest to seperate file (#31665) 
* Adds logging crew manifest to seperate file

* Coding blind

* i can spel words

* Not everyone in the lobby please.

* Proper header

* Fix

* Better format
 2017-10-15 16:56:48 -05:00
WJohn
4b3f578633 Readds the boxstation whiteship as a ruin. (#31709) 
* Adds box's whiteship back as a broken down relic.

* And accompanying files to make it work.

* Derp
 2017-10-15 11:31:48 -05:00
LetterJay
b6f69c88ea Merge pull request #3402 from Citadel-Station-13/upstream-merge-31553 
[MIRROR] Removes a bunch of sleeps/spawns and makes a few booleans defines
 2017-10-15 10:22:59 -04:00
kevinz000
b20e5916ea Removes a bunch of sleeps/spawns and makes a few booleans defines 2017-10-14 18:53:48 -05:00
Emmett Gaines
24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
LetterJay
253f1e3f1c Merge pull request #3379 from Citadel-Station-13/upstream-merge-30570 
[MIRROR] Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes
 2017-10-14 15:37:17 -04:00
kevinz000
77d6420db0 Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes 2017-10-13 19:09:45 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
LetterJay
2e8b198d9a Merge branch 'master' into upstream-merge-31621 2017-10-13 03:58:03 -04:00
LetterJay
f072cac695 Merge pull request #3335 from Citadel-Station-13/upstream-merge-31618 
[MIRROR] Fixes topic key validation
 2017-10-12 23:54:03 -04:00
Jordan Brown
13bffff94b Add require_comms_key = TRUE to some topic that need it 2017-10-12 13:23:35 -05:00
Jordan Brown
76654718f1 Fixes topic key validation 2017-10-12 12:23:00 -05:00
Jordan Brown
e595c2f2fc Fixes adminwho having namecheck as a keyword 2017-10-12 12:22:51 -05:00
kevinz000
9deb3df6af Update material_container.dm (#31555) 2017-10-12 10:39:20 -05:00
LetterJay
f93733576e Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528 
[MIRROR] Minor refactor of how gas IDs are handled
 2017-10-12 07:19:30 -04:00
LetterJay
3ad9f5dc1e Merge pull request #3317 from Citadel-Station-13/upstream-merge-31500 
[MIRROR] sleeping carp grabs now put out a message
 2017-10-12 07:18:27 -04:00
LetterJay
9af6ffa946 Merge pull request #3311 from Citadel-Station-13/upstream-merge-31543 
[MIRROR] Datumizes world/Topic
 2017-10-12 07:16:44 -04:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
oranges
9bd56416f8 Merge pull request #31500 from Armhulen/patch-7 
sleeping carp grabs now put out a message
 2017-10-12 00:29:14 -05:00
Jordan Brown
1604f8b1d3 Datumizes world/Topic (#31543) 
* Datumizes world/Topic

* active_players requires comms_key
 2017-10-12 00:28:27 -05:00
AnturK
5be4669924 Datum antag wizard. 2017-10-11 05:24:17 -05:00
LetterJay
822f15f4ae Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494 
[MIRROR] In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 22:32:52 -04:00
LetterJay
8d604a3922 Merge pull request #3290 from Citadel-Station-13/upstream-merge-31462 
[MIRROR] Fixes headrev TP
 2017-10-10 22:32:12 -04:00
Jordan Brown
7b30be0058 Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war 
In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 13:28:38 -05:00
AnturK
724b0d24fe Fixes headrev TP (#31462) 
* Fixes headrev TP

* Mhm
 2017-10-10 13:20:12 -05:00