shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,970 Commits 5 Branches 0 Tags
db87f3dbae7527df6fe3f4db2d9a8bf5da01143c
Commit Graph

16970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay
db87f3dbae Merge branch 'master' into upstream-merge-37598 2018-05-23 07:44:52 -05:00
CitadelStationBot
469b7772da Automatic changelog generation for PR #6859 [ci skip] 2018-05-23 06:49:46 -05:00
LetterJay
130db93543 Merge pull request #6859 from Citadel-Station-13/upstream-merge-37982 
[MIRROR] Fix flipping of trinary pipe fittings and related RPD tooltips
 2018-05-23 06:49:44 -05:00
CitadelStationBot
90f797e9fa Automatic changelog generation for PR #6858 [ci skip] 2018-05-23 06:49:33 -05:00
LetterJay
938c590ce1 Merge pull request #6858 from Citadel-Station-13/upstream-merge-37984 
[MIRROR] Fix entertainment monitors viewing the wrong Thunderdome
 2018-05-23 06:49:31 -05:00
CitadelStationBot
3b1304e1a2 Automatic changelog generation for PR #6856 [ci skip] 2018-05-23 06:46:04 -05:00
LetterJay
dcaebec121 Merge pull request #6856 from Citadel-Station-13/upstream-merge-37962 
[MIRROR] Fixes gulag teleporter runtime, now automatically sets the default goal of an ID
 2018-05-23 06:46:02 -05:00
LetterJay
521b07ce62 Merge pull request #6855 from Citadel-Station-13/upstream-merge-37986 
[MIRROR] Fix global proccalls not working
 2018-05-23 06:45:49 -05:00
CitadelStationBot
cd6f3d528c Automatic changelog generation for PR #6854 [ci skip] 2018-05-23 06:45:39 -05:00
LetterJay
d45c85bf78 Merge pull request #6854 from Citadel-Station-13/upstream-merge-37968 
[MIRROR] Field generators are now workable by silicons again... but not wirelessly
 2018-05-23 06:45:37 -05:00
CitadelStationBot
adb8c077ab Automatic changelog generation for PR #6853 [ci skip] 2018-05-23 06:45:27 -05:00
LetterJay
ad61d9927e Merge pull request #6853 from Citadel-Station-13/upstream-merge-37969 
[MIRROR] Fixes digital valves not working for silicons
 2018-05-23 06:45:24 -05:00
CitadelStationBot
b515e87f1e Automatic changelog generation for PR #6852 [ci skip] 2018-05-23 06:45:11 -05:00
LetterJay
e37c1886c3 Merge pull request #6852 from Citadel-Station-13/upstream-merge-37970 
[MIRROR] Chasms no longer drop those buckled to undroppable objects
 2018-05-23 06:45:09 -05:00
LetterJay
0556adeb53 Merge pull request #6621 from Citadel-Station-13/upstream-merge-37597 
[MIRROR] replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2
 2018-05-23 06:44:50 -05:00
letterjay
6d087873ba Fix flipping of trinary pipe fittings and related RPD tooltips 2018-05-23 06:33:07 -05:00
Tad Hardesty
782c893cf4 Fix flipping of trinary pipe fittings and related RPD tooltips (#37982) 2018-05-23 06:33:07 -05:00
LetterJay
42dd419f80 Update eutactic_blades.dm 2018-05-23 05:42:31 -05:00
LetterJay
990d997482 Update radio.dm 2018-05-23 05:41:41 -05:00
LetterJay
e7d9cd0698 Merge branch 'master' into upstream-merge-37597 2018-05-23 05:21:19 -05:00
CitadelStationBot
ae279fed73 Automatic changelog generation for PR #6574 [ci skip] 2018-05-23 05:18:18 -05:00
LetterJay
3666ec9878 Merge pull request #6574 from Citadel-Station-13/upstream-merge-37530 
[MIRROR] Replaces HEALS_EARS_2 with a component, adds a wearertargeting parent component for future use
 2018-05-23 05:18:15 -05:00
letterjay
db01c0a9b9 Fix entertainment monitors viewing the wrong Thunderdome 2018-05-23 05:15:46 -05:00
oranges
e0c31c2b3a Merge pull request #37984 from AutomaticFrenzy/patch/thunderdome 
Fix entertainment monitors viewing the wrong Thunderdome
 2018-05-23 05:15:46 -05:00
letterjay
50a85534f5 Fixes gulag teleporter runtime, now automatically sets the default goal of an ID 2018-05-23 01:41:24 -05:00
ShizCalev
bb2f79ed7b Fixes gulag teleporter runtime (#37962) 2018-05-23 01:41:24 -05:00
LetterJay
646ebc9c01 Update _ears.dm 2018-05-22 22:14:41 -05:00
letterjay
2912a220ac Fix global proccalls not working 2018-05-22 22:12:30 -05:00
Jordan Brown
9f8ef69014 Merge pull request #37986 from AutomaticFrenzy/patch/sneaky-cyberboss 
Fix global proccalls not working
 2018-05-22 22:12:30 -05:00
letterjay
45c4d05fb1 Field generators are now workable by silicons again... but not wirelessly 2018-05-22 22:12:22 -05:00
kevinz000
7fb7873bf3 Update field_generator.dm (#37968) 2018-05-22 22:12:22 -05:00
letterjay
f17ca4de1a Fixes digital valves not working for silicons 2018-05-22 22:12:14 -05:00
kevinz000
1b0a6b3bd7 Fixes digital valves not working for silicons (#37969) 
* Update valve.dm

* Blah blah interaction flags
 2018-05-22 22:12:14 -05:00
letterjay
864a2125ad Chasms no longer drop those buckled to undroppable objects 2018-05-22 22:12:06 -05:00
kevinz000
f245529511 Chasms no longer drop those buckled to undroppable objects (#37970) 
* Chasms no longer drop those buckled to undroppable objects

* Moves a check down for efficiency/not needing to check things twice

* Change logic order so this hack works
 2018-05-22 22:12:06 -05:00
CitadelStationBot
292c5dfa96 Automatic changelog generation for PR #6573 [ci skip] 2018-05-22 22:09:37 -05:00
LetterJay
f2b8af5e05 Merge pull request #6573 from Citadel-Station-13/upstream-merge-37529 
[MIRROR] Kills off three more flags from flags_2
 2018-05-22 22:09:34 -05:00
LetterJay
647aa4f306 Update charged.dm 2018-05-22 12:30:43 -05:00
LetterJay
e4c8e1b416 Update eutactic_blades.dm 2018-05-22 09:29:23 -05:00
LetterJay
06b7cdf27a Merge branch 'master' into upstream-merge-37529 2018-05-22 08:02:46 -05:00
LetterJay
488842a520 Update charged.dm 2018-05-22 08:01:29 -05:00
LetterJay
a610e635f1 Update ids.dm 2018-05-22 08:00:04 -05:00
LetterJay
63aa6eeee6 Update lava.dm 2018-05-22 07:58:44 -05:00
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
LetterJay
467819beba Update flags.dm 2018-05-22 07:20:27 -05:00
LetterJay
c1aab03bb5 Merge branch 'master' into upstream-merge-37530 2018-05-22 07:19:06 -05:00
CitadelStationBot
b3e5513185 Automatic changelog generation for PR #6558 [ci skip] 2018-05-22 07:18:36 -05:00
LetterJay
adf1505c70 Merge pull request #6558 from Citadel-Station-13/upstream-merge-37486 
[MIRROR] Moves several clothing-specific flags from /atom to their proper type
 2018-05-22 07:18:34 -05:00
CitadelStationBot
6bbab2ab06 Automatic changelog generation for PR #6555 [ci skip] 2018-05-22 07:17:44 -05:00
LetterJay
01fc8cf128 Merge pull request #6555 from Citadel-Station-13/upstream-merge-37293 
[MIRROR] Modified bomb and syndicate bomb spawner so Cuban Pete bombs maxcap and work again
 2018-05-22 07:17:41 -05:00