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

10682 Commits

Author SHA1 Message Date
LetterJay
db87f3dbae Merge branch 'master' into upstream-merge-37598 2018-05-23 07:44:52 -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
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
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
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
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
Tad Hardesty
782c893cf4 Fix flipping of trinary pipe fittings and related RPD tooltips (#37982) 2018-05-23 06:33:07 -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
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
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
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
kevinz000
7fb7873bf3 Update field_generator.dm (#37968) 2018-05-22 22:12:22 -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
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
LetterJay
647aa4f306 Update charged.dm 2018-05-22 12:30:43 -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
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
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
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
deathride58
9afa6b9290 Merge pull request #6779 from Citadel-Station-13/upstream-merge-37883 
[MIRROR] Fixes soulstone runtime
 2018-05-22 02:30:01 +00:00
deathride58
2d8002ca36 Merge pull request #6826 from Citadel-Station-13/upstream-merge-37935 
[MIRROR] Fix formatting when emagging an R&D console
 2018-05-22 02:29:38 +00:00
deathride58
d0297e326d Merge pull request #6827 from Citadel-Station-13/upstream-merge-37957 
[MIRROR] Fixes defibillator runtime
 2018-05-22 02:29:19 +00:00
deathride58
ce0dac200b Merge pull request #6828 from Citadel-Station-13/upstream-merge-37965 
[MIRROR] Fixes fire_act working on deleted things.
 2018-05-22 02:28:38 +00:00
deathride58
2c73811b1f Merge pull request #6829 from Citadel-Station-13/upstream-merge-37955 
[MIRROR] Keep only the most recent airlock autoclose timer
 2018-05-22 02:28:21 +00:00
deathride58
fd4e6b880a Merge pull request #6830 from Citadel-Station-13/upstream-merge-37943 
[MIRROR] Fix mindswap forcibly enabling ambient occlusion
 2018-05-22 02:27:55 +00:00
deathride58
32c63c2e70 Merge pull request #6831 from Citadel-Station-13/upstream-merge-37961 
[MIRROR] Enable admin AI interaction for firelocks
 2018-05-22 02:27:39 +00:00
deathride58
1e7839342f Merge pull request #6832 from Citadel-Station-13/upstream-merge-37944 
[MIRROR] Remove second copy of jQuery used only by IRV polls
 2018-05-22 02:27:21 +00:00
deathride58
c376ef6268 Merge pull request #6833 from Citadel-Station-13/upstream-merge-37956 
[MIRROR] Cleans up duplicate get_area's in c.grenade priming
 2018-05-22 02:27:01 +00:00
deathride58
3d9af22c4c Merge pull request #6834 from Citadel-Station-13/upstream-merge-37906 
[MIRROR] Removes firing-pins box in RD's locker
 2018-05-22 02:26:39 +00:00
deathride58
20109138c0 Merge pull request #6836 from Citadel-Station-13/upstream-merge-37934 
[MIRROR] Migrate goonchat pings to a subsystem
 2018-05-22 02:26:18 +00:00
deathride58
2f5ea131a3 Merge pull request #6837 from Citadel-Station-13/upstream-merge-37972 
[MIRROR] Fixes an oops in circuit printer description check
 2018-05-22 02:25:56 +00:00
deathride58
56dbd7c980 Merge pull request #6838 from Citadel-Station-13/upstream-merge-37974 
[MIRROR] Fix glowshrooms missing their icon in the editor
 2018-05-22 02:25:34 +00:00
deathride58
f0a9344c8e Merge pull request #6839 from Citadel-Station-13/upstream-merge-37900 
[MIRROR] Adds OOC verb to show the last round end report you've viewed
 2018-05-22 02:25:13 +00:00
deathride58
5b15984c0e Merge pull request #6840 from Citadel-Station-13/upstream-merge-37945 
[MIRROR] Fix construction behavior of hydroponics trays
 2018-05-22 02:24:57 +00:00
Jordan Brown
46f90d8fae Merge pull request #37973 from AutomaticFrenzy/patch/your-the-jaunter 
Fix wormhole jaunter grammar
 2018-05-21 17:03:46 -05:00
oranges
3fd74027c1 Merge pull request #37945 from AutomaticFrenzy/patch/hydroponics-trays 
Fix construction behavior of hydroponics trays
 2018-05-21 16:58:31 -05:00
Jordan Brown
96106ff2e8 Adds OOC verb to show the last round end report you've viewed (#37900) 
You can now view your last round end report window with the "Your last round" verb in the OOC tab

stores the HTML in a data dir
 2018-05-21 16:48:08 -05:00
Jordan Brown
638c2eb81d Merge pull request #37974 from AutomaticFrenzy/patch/glowshroom-icon 
Fix glowshrooms missing their icon in the editor
 2018-05-21 16:44:52 -05:00
Jordan Brown
b7fd3a37e2 Merge pull request #37972 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/patch-1 
Fixes an oops in circuit printer description check
 2018-05-21 16:43:42 -05:00
oranges
c27d97a6e5 Merge pull request #37934 from AutomaticFrenzy/patch/ssping 
Migrate goonchat pings to a subsystem
 2018-05-21 16:40:29 -05:00
Wilchenx
85ef262082 Removes firing-pins box in RD's locker (#37906) 
Makes no sense since science can't print any guns and probably won't ever be able to again.
 2018-05-21 16:36:04 -05:00
Jordan Brown
0d08eca330 Merge pull request #37956 from ShizCalev/chem-grenade-cleanup 
Cleans up duplicate get_area's in c.grenade priming
 2018-05-21 16:35:54 -05:00
Jordan Brown
ec14a7c7ef Merge pull request #37944 from AutomaticFrenzy/patch/irv-jquery 
Remove second copy of jQuery used only by IRV polls
 2018-05-21 16:33:42 -05:00