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

6388 Commits

Author SHA1 Message Date
LetterJay
9ff3e78bbb Merge pull request #6620 from Citadel-Station-13/upstream-merge-37598 
[MIRROR] Adds grenadine.
 2018-05-23 22:26:44 -05:00
LetterJay
63a857901f Merge pull request #6642 from Citadel-Station-13/upstream-merge-37623 
[MIRROR] Some dbadmin fixes
 2018-05-23 22:26:22 -05:00
deathride58
5f60f30700 Adds custom say verbs, makes yelling echo and penetrate walls, makes distant voices have small text (#6615) 
* adds custom say emotes, makes yelling penetrate walls and echo throughout areas

* Update say.dm

* Update say.dm

* Update say.dm

* Update mob.dm

* makes yelling unable to penetrate space
 2018-05-23 12:14:18 -07:00
Hatterhat
88382c1058 fixes flash icons (#6860) 
because people keep whining about it and because kev wanted me to do it for him with a webeditor pr
 2018-05-23 11:56:34 -07:00
LetterJay
e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582 
[MIRROR] Makes more messages pronoun sensitive
 2018-05-23 07:46:26 -05:00
LetterJay
db87f3dbae Merge branch 'master' into upstream-merge-37598 2018-05-23 07:44:52 -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
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
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
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
a659e3c0b3 Update photocopier.dm 2018-05-22 07:56:25 -05:00
LetterJay
664f2ac150 Merge branch 'master' into upstream-merge-37623 2018-05-22 07:23:41 -05:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -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