shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,119 Commits 5 Branches 0 Tags
f8bd9ecf9ca219f373ec00ce48397bc624776dd9
Commit Graph

589 Commits

Author SHA1 Message Date
Jordan Brown
47f88be07f Fixes TakeComponent (#32156) 
* Fixes TakeComponent

* Add the note about OnTransfer and COMPONENT_INCOMPATIBLE

* Fix behaviour

* Missed datum.dm
 2017-10-30 03:53:00 -05:00
LetterJay
f1002a7109 Merge pull request #3672 from Citadel-Station-13/upstream-merge-32206 
[MIRROR] Fixes map_config validation
 2017-10-30 00:00:31 -04:00
LetterJay
4d3211f273 Merge pull request #3675 from Citadel-Station-13/upstream-merge-32185 
[MIRROR] Fixes TP wizarding.
 2017-10-29 23:37:30 -04:00
LetterJay
84272ea241 Merge branch 'master' into upstream-merge-32206 2017-10-29 23:36:39 -04:00
LetterJay
b6f0423840 Update map_config.dm 2017-10-29 22:23:17 -05:00
LetterJay
5a92bafa75 Merge pull request #3670 from Citadel-Station-13/upstream-merge-31966 
[MIRROR] Spooky Spectral Instruments
 2017-10-29 15:51:17 -04:00
LetterJay
5210883d3b Merge pull request #3656 from Citadel-Station-13/upstream-merge-32132 
[MIRROR] Map config cleanup
 2017-10-29 15:49:08 -04:00
LetterJay
47cfffbb26 Merge pull request #3648 from Citadel-Station-13/upstream-merge-32116 
[MIRROR] Line by line profiling system
 2017-10-29 15:48:47 -04:00
Jordan Brown
cab7c8009c Merge pull request #32185 from AnturK/wiztypo 
Fixes TP wizarding.
 2017-10-29 10:37:03 -05:00
Jordan Brown
37fdf365a5 Fixes map_config validation 2017-10-29 10:26:20 -05:00
Mercenaryblue
819244575d Spooky Spectral Instruments (#31966) 
* [dooting intensifies]

Spectral Instruments added
To be used with Spooky Skeletons.

* Spectral Re-balance

The spectral instruments no longer stun living creatures.
Text make you retain your loyalties now.

* Requested Changes

Added variable "too_spooky".
Defines if it will spawn a new instrument.
Re-balanced damage to 5 hits average per conversion.
Added admin notice to changelog.

* Loyalty text fix

* Spooky Trumpets

Removed comment.
Added missing spookiness.

* Spooky Dooting

Major Overhaul.

removed /brass/
Spooky Dooting is now a component.
Boneless humanoids no longer lose stamina.

* Spooky Dooting

mk2
 2017-10-29 07:35:16 -05:00
LetterJay
5c08f91a5a Merge pull request #3662 from Citadel-Station-13/upstream-merge-32091 
[MIRROR] Revheads now always recieve a HUD when created
 2017-10-29 04:23:26 -04:00
LetterJay
f900f2ea9a Merge pull request #3660 from Citadel-Station-13/upstream-merge-31864 
[MIRROR] Makes thermite a component
 2017-10-29 04:23:16 -04:00
LetterJay
1005211741 Merge pull request #3654 from Citadel-Station-13/upstream-merge-32130 
[MIRROR] [s] Makes ImmediateInvokeAsync a world proc
 2017-10-29 03:47:12 -04:00
LetterJay
4b300cee6c Merge branch 'master' into upstream-merge-32116 2017-10-29 03:45:59 -04:00
LetterJay
c62f6ec353 Merge pull request #3632 from Citadel-Station-13/upstream-merge-32093 
[MIRROR] Roundstart species pref fixes/removes redundant species config
 2017-10-29 03:41:59 -04:00
LetterJay
74a33169cb Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051 
[MIRROR] More radiation balance changes and fixes
 2017-10-29 02:41:44 -04:00
LetterJay
bea9365ea9 Merge branch 'master' into upstream-merge-32093 2017-10-29 02:27:52 -04:00
LetterJay
e150fe28b6 Merge branch 'master' into upstream-merge-31877 2017-10-28 23:57:51 -04:00
CitadelStationBot
1265e804c5 [MIRROR] Adds a method to transfer all components from one datum to another (#3661) 
* Merge pull request #31941 from tgstation/Cyberboss-patch-2

Adds a method to transfer all components from one datum to another

* Adds a method to transfer all components from one datum to another
 2017-10-28 01:19:48 -07:00
LetterJay
0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
oranges
730c13f980 Merge pull request #32091 from tgstation/Cyberboss-patch-1 
Revheads now always recieve a HUD when created
 2017-10-27 17:44:06 -05:00
Jordan Brown
82c388b3e8 Makes thermite a component 2017-10-27 17:36:38 -05:00
Jordan Brown
27492e891f Map config cleanup (#32132) 
* Map config cleanup

* Fix
 2017-10-27 17:35:05 -05:00
oranges
f6a00d4a38 Merge pull request #32130 from Cyberboss/call_security 
[s] Makes ImmediateInvokeAsync a world proc
 2017-10-27 17:33:42 -05:00
Jordan Brown
f36d3ff08a Line by line profiling system 2017-10-27 13:10:21 -05:00
Emmett Gaines
ea36d5944e More radiation balance changes and fixes (#32051) 
* more balance changes and fixes

* cleanup
 2017-10-27 03:08:03 -05:00
LetterJay
af96c29a0c Merge pull request #3635 from ktccd/Undo_Borer_HUDS 
Undoes Borer HUDs
 2017-10-27 02:49:03 -04:00
LetterJay
a7b464e47e Merge pull request #3620 from Citadel-Station-13/upstream-merge-32030 
[MIRROR] Allows components to qdel from Initialize
 2017-10-27 02:19:07 -04:00
LetterJay
6713634146 Merge pull request #3616 from Citadel-Station-13/upstream-merge-32084 
[MIRROR] Fixes minor runtime
 2017-10-27 02:18:02 -04:00
LetterJay
6b0bb7268e Merge pull request #3611 from Citadel-Station-13/upstream-merge-31945 
[MIRROR] Adds ambience to the SM and portable generators
 2017-10-27 02:16:02 -04:00
ktccd
ad911c2b1b Undoes Borer HUDs 
Critical flaw in antag-HUD system prevented proper use, since automatic
reverting of original PR is no longer possible, (Probably due to another
antag-hud being added afterwards), this is a manual one.
 2017-10-26 21:19:34 +02:00
KorPhaeron
ef9c27ef0a Roundstart species pref fixes/removes redundant species config 2017-10-26 12:00:56 -05:00
Jordan Brown
50f942ef4e Allows components to qdel from Initialize 2017-10-26 00:01:52 -05:00
AnturK
6c89f2c8aa Fixes minor runtime 2017-10-25 23:40:59 -05:00
Emmett Gaines
c7d3696636 Adds ambience to the SM and portable generators (#31945) 
* Adds aambience to the SM and portable generators

* lowered pitch of supermatter

* start and end fix
 2017-10-25 23:37:14 -05:00
Ashe Higgs
773b44e799 Cogscarab shells/construct chassis on spawn menu (#32048) 2017-10-25 21:45:40 -05:00
LetterJay
e20664dad3 Revert "Revert "[MIRROR] Late join antagonists will try to target late join players"" 2017-10-24 18:18:20 -05:00
LetterJay
aa420067ba Revert "[MIRROR] Late join antagonists will try to target late join players" 2017-10-24 00:09:11 -05:00
Jordan Brown
94826620fa Late join antagonists will try to target late join players (#31560) 2017-10-23 20:08:43 -05:00
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
Poojawa
62273a3867 Merge branch 'master' into upstream-merge-31737 2017-10-21 07:18:14 -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