ccb8a98a85
Merge pull request #38047 from tgstation/MrStonedOne-patch-1
...
Sync permanent admin removals to the players table immediately
2018-05-25 10:37:22 -05:00
2d52fed76d
Merge pull request #6866 from Citadel-Station-13/upstream-merge-37994
...
[MIRROR] Adds a sprite for the "quit vr" action button[cast ur mf votes inside]
2018-05-25 02:37:39 -05:00
273e2aa13d
Merge pull request #6865 from Citadel-Station-13/upstream-merge-38000
...
[MIRROR] Removes a couple thousand empty lists
2018-05-25 02:37:18 -05:00
567118067f
Merge pull request #6864 from Citadel-Station-13/upstream-merge-37999
...
[MIRROR] Fixes reactive repulse armour not throwing people
2018-05-25 02:36:49 -05:00
ac8640c9b5
Merge pull request #6863 from Citadel-Station-13/upstream-merge-38004
...
[MIRROR] Fixes mimery blockade showing up under spell tab
2018-05-25 02:36:19 -05:00
6750abeb9e
Merge pull request #6862 from Citadel-Station-13/upstream-merge-38020
...
[MIRROR] Fix outdated R&D console comment
2018-05-25 02:35:58 -05:00
2908431bac
Merge pull request #6857 from Citadel-Station-13/upstream-merge-37951
...
[MIRROR] adds logging to mayhem bottle and blood frenzy
2018-05-25 02:35:43 -05:00
37f2768380
[MIRROR] Adds a missing + in techwebs point adjustment code ( #6845 )
...
* Adds a missing + in techwebs point adjustment code
* Update _techweb.dm
2018-05-24 20:55:23 -07:00
b89254ced7
Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448
...
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
2018-05-24 11:58:57 -05:00
9ff3e78bbb
Merge pull request #6620 from Citadel-Station-13/upstream-merge-37598
...
[MIRROR] Adds grenadine.
2018-05-23 22:26:44 -05:00
63a857901f
Merge pull request #6642 from Citadel-Station-13/upstream-merge-37623
...
[MIRROR] Some dbadmin fixes
2018-05-23 22:26:22 -05:00
1a40822f17
Adds a sprite for the "quit vr" action button ( #37994 )
...
* is that a motherfucking 90s reference
* WHEN YA FUCK UP BADLY ENOUGH ON ADDING A SPRITE TGHAT YA GOTTA MANUALLY CHANGE CHANGELOG.HTML
2018-05-23 21:18:54 -05:00
36b3cbe4bf
Removes a couple thousand empty lists ( #38000 )
...
door.shockedby
2018-05-23 21:15:41 -05:00
64ead10924
Fixes reactive repulse armour ( #37999 )
2018-05-23 21:00:10 -05:00
14de47bd4b
Fixes mimery blockade showing up under spell tab ( #38004 )
2018-05-23 19:44:16 -05:00
aec2e19b94
Fix outdated R&D console comment ( #38020 )
2018-05-23 16:12:04 -05:00
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
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
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
db87f3dbae
Merge branch 'master' into upstream-merge-37598
2018-05-23 07:44:52 -05:00
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
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
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
e7d9cd0698
Merge branch 'master' into upstream-merge-37597
2018-05-23 05:21:19 -05:00
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
5016ea6186
Add logging to mayhem bottle and blood frenzy ( #37951 )
...
* who the fuck didnt make this logged ages ago jesus fucking christ
* who fucking coded this garbage why isnt it a status effect
* Update mines.dm
* reeeeeeeee
* reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
2018-05-23 01:41:33 -05:00
646ebc9c01
Update _ears.dm
2018-05-22 22:14:41 -05:00
9f8ef69014
Merge pull request #37986 from AutomaticFrenzy/patch/sneaky-cyberboss
...
Fix global proccalls not working
2018-05-22 22:12:30 -05:00
7fb7873bf3
Update field_generator.dm ( #37968 )
2018-05-22 22:12:22 -05:00
1b0a6b3bd7
Fixes digital valves not working for silicons ( #37969 )
...
* Update valve.dm
* Blah blah interaction flags
2018-05-22 22:12:14 -05:00
647aa4f306
Update charged.dm
2018-05-22 12:30:43 -05:00
06b7cdf27a
Merge branch 'master' into upstream-merge-37529
2018-05-22 08:02:46 -05:00
488842a520
Update charged.dm
2018-05-22 08:01:29 -05:00
a659e3c0b3
Update photocopier.dm
2018-05-22 07:56:25 -05:00
664f2ac150
Merge branch 'master' into upstream-merge-37623
2018-05-22 07:23:41 -05:00
5f27ac30c7
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
6a575f19d1
Merge branch 'master' into upstream-merge-37597
2018-05-22 07:21:53 -05:00
c1aab03bb5
Merge branch 'master' into upstream-merge-37530
2018-05-22 07:19:06 -05:00
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
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
9afa6b9290
Merge pull request #6779 from Citadel-Station-13/upstream-merge-37883
...
[MIRROR] Fixes soulstone runtime
2018-05-22 02:30:01 +00:00
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
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
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
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
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
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
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
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
46f90d8fae
Merge pull request #37973 from AutomaticFrenzy/patch/your-the-jaunter
...
Fix wormhole jaunter grammar
2018-05-21 17:03:46 -05:00
Jordan Brown