XDTM
bb903b339c
RealFix
2017-08-19 01:56:46 +02:00
XDTM
a5d65abd61
Diseases will properly make new symptoms instead of sharing the same for everyone
2017-08-18 20:47:10 +02:00
MoreRobustThanYou
4f3657a05b
Makes RCL icons better at updating
...
and also fixes buggy ghetto RCL sprites
2017-08-18 14:11:50 -04:00
Leo
b53a2247ff
Merge pull request #29980 from Iamgoofball/patch-294
...
Removes blob cuddling
2017-08-18 12:48:30 -03:00
shizcalev
ec3a80b9bd
Singularities dig up asteroid turf
2017-08-18 01:26:03 -04:00
Jordan Brown
a4f3df42ff
The TSA has reason to believe there are weapons in the airport
2017-08-18 01:09:07 -04:00
Jordan Brown
728aefbd70
Adds DropLocation(). To generally be preferred to get_turf() ( #29814 )
...
Fixes #29802
Unlike get_turf()this will sensibly pick if loc can be safely used
2017-08-18 16:44:20 +12:00
Jordan Brown
c5db97a61a
Merge pull request #29966 from ShizCalev/turf-varedits
...
Cleaned up dirty turf varedits
2017-08-18 00:15:57 -04:00
shizcalev
75dc5d8272
Moved emagged var to item parent.
2017-08-17 22:15:11 -04:00
oranges
a9ee524218
Merge pull request #29960 from pubby/weed
...
Fix spelling of "cannabis"
2017-08-18 13:18:55 +12:00
Kyle Spier-Swenson
8340abcd69
readds toggle_hear_radio admin verb
...
This is a admin version of the ghost preference that hides radio chatter even when human, even from near by radios/intercoms
Its an old verb, it was removed accidentally in my datum top menu rewrite, and it needs to come back because a admin got their shit stuck in disabled and couldn't re-enable it.
2017-08-17 15:43:44 -07:00
MoreRobustThanYou
093cb1a184
Adds RCL inhands ( #29964 )
...
* Adds RCL inhands
* Okkk
* MERGE CONFLICKTS 4EVER
* ree
2017-08-17 19:21:06 -03:00
Remie Richards
c34cbf3752
Revert "Revert "Revert "Revert "Revert "Improves bee lore" ( #29972 )" ( #29976 )" ( #29986 )" ( #29987 )" ( #29988 )
...
This reverts commit f2a96db8e8 .
2017-08-17 21:20:26 +01:00
Kyle Spier-Swenson
f2a96db8e8
Revert "Revert "Revert "Revert "Improves bee lore" ( #29972 )" ( #29976 )" ( #29986 )" ( #29987 )
...
This reverts commit 5918156ca3 .
2017-08-17 16:20:05 -04:00
Remie Richards
5918156ca3
Revert "Revert "Revert "Improves bee lore" ( #29972 )" ( #29976 )" ( #29986 )
...
This reverts commit 92e1a1afd1 .
2017-08-17 21:04:19 +01:00
Iamgoofball
92e1a1afd1
Revert "Revert "Improves bee lore" ( #29972 )" ( #29976 )
...
This reverts commit e1d876bfcb .
2017-08-17 16:03:52 -04:00
Jordan Brown
948b0a0287
Gives SSdisease SS_NO_INIT
2017-08-17 15:24:50 -04:00
Xhuis
d31285cb1b
Removes the chat message from *spin
2017-08-17 12:00:10 -04:00
Jordan Brown
7cc2079297
Merge pull request #29948
2017-08-17 10:13:12 -04:00
Jordan Brown
2d26233c6d
Merge pull request #29945
2017-08-17 10:13:06 -04:00
Jordan Brown
641ba9c145
Merge pull request #29940
2017-08-17 10:13:00 -04:00
Jordan Brown
47e1cfb179
Merge pull request #29934
2017-08-17 10:12:51 -04:00
Jordan Brown
4fe6c4f06d
Removes redundant check ( #29950 )
2017-08-17 10:30:59 -03:00
Iamgoofball
3685726f7c
Removes useless clutter.
2017-08-17 05:00:03 -07:00
Shadowlight213
e1d876bfcb
Revert "Improves bee lore" ( #29972 )
2017-08-17 08:50:28 +01:00
AnturK
94a5f4570a
Fixes dumping from inside the lockers ( #29896 )
2017-08-17 18:57:30 +12:00
Iamgoofball
5fef7c6999
Improves bee lore
2017-08-16 21:31:40 -07:00
shizcalev
bb4e0c94dd
Cleaned up dirty turf varedits
2017-08-16 22:14:58 -04:00
nicbn
ab406fbccf
Changes smes, cells, cell charger, terminals and apcs icons ( #29931 )
...
* 1
* Cell charger shows what's inside
* CONSTRASTE!
* charge! bar
* kindafix offset
2017-08-16 21:02:01 -04:00
oranges
55adaa06c5
Merge pull request #29955 from tgstation/Cyberboss-patch-6
...
Removes admin type shortcut for /weapon
2017-08-17 11:50:05 +12:00
oranges
50de9ae586
Merge pull request #29914 from ShizCalev/baseturf-move
...
Relocates baseturf helper
2017-08-17 11:06:49 +12:00
MoreRobustThanYou
bda8fb9fc8
Blobs can now sense loving cuddles! ( #29820 )
...
There is now a chat message when you help intent on a blob
2017-08-17 10:59:56 +12:00
BeeSting12
6899ec420d
Removes meth explosion syringes ( #29912 )
...
balance: The meth explosion temperature has been raised.
Being shot and exploded in under five seconds in a relatively easy to make manner is not fun for anyone.
2017-08-17 10:58:53 +12:00
oranges
bb45919ae6
Merge pull request #29688 from PraiseRatvar/PraiseRatvar-patch-1
...
Nerfs L6 SAW Hollow Point Bullets from -10 armour penetration to -60 armour penetration.
2017-08-17 10:53:33 +12:00
oranges
29e0863569
Merge pull request #29797 from Cyberboss/RemoveWorld
...
Moves most of world.dm
2017-08-17 10:51:28 +12:00
oranges
0bfe9b0de9
Merge pull request #29937 from ShizCalev/turret-fix
...
[s] Fixes MG turret firing while the user is stunned/cuffed/unconscious
2017-08-17 10:49:24 +12:00
oranges
b11b33bdac
Merge pull request #29954 from Cyberboss/RemoveItemCrafting
...
Fixes weaponcrafting repath
2017-08-17 10:46:34 +12:00
ShizCalev
0e8fa79065
Everything from before but less merge conflicty ( #29905 )
2017-08-16 15:17:10 -04:00
Ian Turk
d50b0c6e63
resolved conflicts
2017-08-16 13:11:21 -06:00
Ian Turk
7460f2c5b8
Replaced flags with flags_1
2017-08-16 13:01:15 -06:00
ShizCalev
24811251a7
Fixed mop inhand, adds new inhand for the advanced mop ( #29910 )
...
* inhands
* adds inhand, fixes other inhands
2017-08-16 14:08:18 -04:00
Jordan Brown
fab63821f5
Fixes weaponcrafting repath
2017-08-16 12:15:08 -04:00
Jordan Brown
2f5b302354
WHY DOES THIS COMPILE
2017-08-16 12:12:03 -04:00
shizcalev
5d15fb46cb
Relocates baseturf helper
2017-08-16 11:29:59 -04:00
ShizCalev
bfe27a5f98
Merge branch 'master' into crafting-fixes
2017-08-16 11:19:30 -04:00
Ian Turk
1b7ca8c0e5
Resolved merge conflicts
2017-08-16 08:33:24 -06:00
pubby
10e454a137
Fix cannabis spelling
2017-08-16 08:45:33 -05:00
Jordan Brown
af4d9a85c9
Repaths /obj/item/weapon to /obj/item ( #29929 )
2017-08-16 10:38:51 -03:00
Joan Lung
a24c25fca9
Megafauna will now always show up in the orbit list ( #29907 )
2017-08-16 01:00:37 -05:00
Xhuis
3e2c973993
Changes the sound of the station explosion
2017-08-16 01:56:52 -04:00