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

6363 Commits

Author SHA1 Message Date
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
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
LetterJay
646ebc9c01 Update _ears.dm 2018-05-22 22:14:41 -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
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
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -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
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
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
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
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
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
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
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
Jordan Brown
1766134062 Merge pull request #37943 from AutomaticFrenzy/patch/mind-over-matter 
Fix mindswap forcibly enabling ambient occlusion
 2018-05-21 16:31:21 -05:00
Jordan Brown
60b3384695 Merge pull request #37965 from AnturK/whatthecommentsays 
Fixes fire_act working on deleted things.
 2018-05-21 16:27:55 -05:00
LetterJay
be6fd4f0ca Update vg_hats.dm 2018-05-21 12:33:14 -05:00
LetterJay
f0c99c5f9c Update life.dm 2018-05-21 12:32:44 -05:00
LetterJay
359d31238d Merge branch 'master' into upstream-merge-37486 2018-05-21 11:59:57 -05:00
Tad Hardesty
6167423c85 Fix formatting when emagging an R&D console 2018-05-21 11:25:48 -05:00
LetterJay
6489ef5511 Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476 
[MIRROR] Uppercases slot defines.
 2018-05-21 11:23:02 -05:00
LetterJay
931a950adb Merge branch 'master' into upstream-merge-37486 2018-05-21 08:59:32 -05:00
LetterJay
39365437f5 Merge branch 'master' into upstream-merge-37293 2018-05-21 08:53:17 -05:00
LetterJay
6060df5b92 Merge pull request #6554 from Citadel-Station-13/upstream-merge-37267 
[MIRROR] Adds log and management tabs to permissions panel
 2018-05-21 08:42:21 -05:00
LetterJay
0b26ea7b5e Merge pull request #6823 from Citadel-Station-13/upstream-merge-37925 
[MIRROR] Removes skewium from saferChems
 2018-05-21 08:29:31 -05:00
LetterJay
cb5ea0aab7 Merge pull request #6822 from Citadel-Station-13/upstream-merge-37600 
[MIRROR] Refactors hydrocarbon combustion + other general atmos code changes
 2018-05-21 08:29:16 -05:00
LetterJay
52bd7904be Merge pull request #6821 from Citadel-Station-13/upstream-merge-37927 
[MIRROR] Replaces nauseous with nauseated
 2018-05-21 08:29:00 -05:00
LetterJay
388c17664f Merge pull request #6820 from Citadel-Station-13/upstream-merge-37938 
[MIRROR] Fixes some issues with pacifism by disabling intent auto-switch
 2018-05-21 08:28:47 -05:00
LetterJay
1afdd03d78 Merge pull request #6819 from Citadel-Station-13/upstream-merge-37937 
[MIRROR] Emagging a R&D console now unlocks it and prevents it from being locked as opposed to nothing
 2018-05-21 08:28:30 -05:00
LetterJay
1896bc86e8 Merge pull request #6817 from Citadel-Station-13/upstream-merge-37633 
[MIRROR] Circuit Labels (sorta understanding git edition)
 2018-05-21 08:28:13 -05:00
LetterJay
9121d4968e Merge pull request #6789 from Citadel-Station-13/upstream-merge-37891 
[MIRROR] Cleans up clap bodypart check
 2018-05-21 08:27:57 -05:00
81Denton
1c51f32b31 Remove skewium from saferChems (#37925) 2018-05-21 03:57:05 -05:00
cyclowns
7cc9d9103d Refactors hydrocarbon combustion + other general atmos code changes (#37600) 
* splits hydrocarbon combustion + other stuff

* nob max() thing

* whoops

* remove proc + new define
 2018-05-21 03:21:08 -05:00
Nich
177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -05:00
Mickyan
2b9d18597b Remove intent auto switch from pacifism (#37938) 2018-05-21 02:54:14 -05:00
kevinz000
73b0ac7859 Emagging a R&D console now unlocks it and prevents it from being locked as opposed to nothing (#37937) 
* rdconsole emagging

* Fix grammar
 2018-05-21 02:38:44 -05:00
r-esistor
63e472050c Circuit Labels (sorta understanding git edition) (#37633) 
* Customizable circuit names/descriptions

* Circuit descriptions are now copied

* Prevents code injection through the desc
 2018-05-21 02:11:50 -05:00