kevinz000
df590fd8c1
Merge remote-tracking branch 'Citadel-Station-13/master' into Citadel-Station-13/custom_roundstart_items
2017-07-16 20:30:27 -07:00
CitadelStationBot
c16b174200
Automatic changelog generation for PR #1722 [ci skip]
2017-07-01 23:22:30 -05:00
CitadelStationBot and kevinz000
793a2ce28f
Grammar and message tweaks ( #1722 )
2017-07-01 21:22:29 -07:00
CitadelStationBot
1a4afce396
Automatic changelog generation for PR #1802 [ci skip]
2017-07-01 23:22:00 -05:00
CitadelStationBot and kevinz000
82e8b54738
Mesons work on lavaland again ( #1802 )
2017-07-01 21:21:59 -07:00
CitadelStationBot and kevinz000
5f6a2a999a
Chasms, asteroid turfs, basalt, and lava can no longer be made wet ( #1847 )
2017-07-01 21:21:24 -07:00
CitadelStationBot
13857f4fbf
Automatic changelog generation for PR #1851 [ci skip]
2017-07-01 23:21:04 -05:00
CitadelStationBot and kevinz000
7b89ab66a2
Fixes reskinned guns being invisible ( #1851 )
2017-07-01 21:21:03 -07:00
CitadelStationBot
f6db14c895
Automatic changelog generation for PR #1852 [ci skip]
2017-07-01 23:20:49 -05:00
CitadelStationBot and kevinz000
ac16176c20
Fixes deathgasping while being cloned ( #1852 )
2017-07-01 21:20:47 -07:00
CitadelStationBot and kevinz000
73557a5e5f
Fixes cardboard tube duping ( #1854 )
2017-07-01 21:20:39 -07:00
LetterJay and GitHub
682abbf6aa
Merge pull request #1850 from Citadel-Station-13/upstream-merge-28933
...
[MIRROR] Speeds up SSoverlays
2017-07-01 14:24:12 -05:00
CitadelStationBot
bb34fa8c8a
Speeds up SSoverlays
2017-07-01 13:55:20 -05:00
CitadelStationBot
6ee346be55
Automatic changelog generation for PR #1718 [ci skip]
2017-06-30 23:26:12 -05:00
CitadelStationBot and kevinz000
c80d8af7aa
[MIRROR] Makes dressers buildable ( #1718 )
...
* Makes dressers buildable
* Delete sheet_types.dm.rej
2017-06-30 21:26:11 -07:00
CitadelStationBot
80048866a1
Automatic changelog generation for PR #1827 [ci skip]
2017-06-30 23:25:18 -05:00
katnep and kevinz000
b21556329b
TAUR SWEATERS and keyhole ( #1827 )
...
by request of annoying whiners, here are sweaters in the clothes mate
have fun
2017-06-30 21:25:17 -07:00
CitadelStationBot and kevinz000
8627946f72
Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once ( #1753 )
2017-06-30 21:22:45 -07:00
CitadelStationBot and kevinz000
32c35a211b
[MIRROR] Fixes abductors not being able to sleep people ( #1692 )
...
* Fixes abductors not being able to sleep people
* Update abduction_gear.dm
* Delete abduction_gear.dm.rej
2017-06-30 21:21:26 -07:00
CitadelStationBot and kevinz000
471380aa2c
Makes movement delay calculation not round to the tick ( #1711 )
2017-06-30 21:20:26 -07:00
CitadelStationBot
f670e932b6
Automatic changelog generation for PR #1700 [ci skip]
2017-06-30 23:17:27 -05:00
CitadelStationBot and kevinz000
5181326d54
[MIRROR] Adds some custom force strings and fixes a bug ( #1700 )
...
* Adds some custom force strings and fixes a bug
* Delete clown_items.dm.rej
2017-06-30 21:17:26 -07:00
CitadelStationBot and kevinz000
259d773cec
Round ID is now sent to IRC ( #1706 )
2017-06-30 21:16:44 -07:00
CitadelStationBot
0c2725c239
Automatic changelog generation for PR #1707 [ci skip]
2017-06-30 22:57:28 -05:00
CitadelStationBot and kevinz000
0c9b72f7fc
Fixes pimpin ride janicart (and other ridden vehicles) being spaceworthy ( #1707 )
2017-06-30 20:57:27 -07:00
CitadelStationBot
a68255e226
Automatic changelog generation for PR #1694 [ci skip]
2017-06-30 22:57:01 -05:00
CitadelStationBot and kevinz000
b5025653b6
Luxury shelter capsules' display cases no longer spawn offhand objects ( Fixes #28589 ) ( #1694 )
2017-06-30 20:57:00 -07:00
CitadelStationBot and kevinz000
ca2d03a082
Moves transit space to separate z level. ( #1696 )
2017-06-30 20:56:45 -07:00
CitadelStationBot
2304cb7887
Automatic changelog generation for PR #1775 [ci skip]
2017-06-30 22:53:25 -05:00
CitadelStationBot and kevinz000
0831c68ad3
Lowercases the names of most glasses, changes the thermonocle's description based on its examiner ( #1775 )
2017-06-30 20:53:24 -07:00
CitadelStationBot and kevinz000
488f6350ed
Revert "Freezers and heaters now drop the correct materials" ( #1819 )
2017-06-30 20:49:04 -07:00
CitadelStationBot and kevinz000
fce1875d73
Observers can see through some alternate apperances ( #1829 )
2017-06-30 20:47:57 -07:00
CitadelStationBot and kevinz000
a9a2a29dd4
Fix the lobby menu not showing when the mysql connection had ghosted ( #1839 )
2017-06-30 20:47:36 -07:00
CitadelStationBot
0c6c35fe7f
Automatic changelog generation for PR #1844 [ci skip]
2017-06-30 22:47:22 -05:00
CitadelStationBot and kevinz000
1ad4947e58
Adds a small recovery window to variable length megafauna attacks for more predictable melee resolution ( #1844 )
2017-06-30 20:47:21 -07:00
CitadelStationBot
72a9272969
Automatic changelog generation for PR #1716 [ci skip]
2017-06-30 22:46:41 -05:00
CitadelStationBot and kevinz000
01456fddf1
Fixed small spelling + punctuation errors ( #1716 )
2017-06-30 20:46:40 -07:00
CitadelStationBot and kevinz000
57bf6fc7ba
Machinery clears it's occupant var if removed ( #1767 )
2017-06-30 20:42:58 -07:00
CitadelStationBot and kevinz000
9d5e51777b
use_power var now uses a define to reflect it not being a bool ( #1842 )
2017-06-30 20:41:59 -07:00
LetterJay and GitHub
c32da6e2cb
Merge pull request #1840 from Citadel-Station-13/upstream-merge-28932
...
[MIRROR] Show ban id to banned players
2017-06-30 22:38:26 -05:00
CitadelStationBot and kevinz000
d105e57af1
Do not use your brain, do not look at the code, do not engage me ( #1818 )
2017-06-30 20:21:34 -07:00
CitadelStationBot and kevinz000
3b06da0774
Converts shelter_2.dmm to TGM ( #1733 )
2017-06-30 20:20:14 -07:00
CitadelStationBot
3e128f2e74
Automatic changelog generation for PR #1828 [ci skip]
2017-06-30 22:12:12 -05:00
katnep and kevinz000
45ce2c4caa
STIMPACKS POWERCREEP EDITION ( #1828 )
...
* STIMPACKS POWERCREEP EDITION
added stimpacks and stimpack kits to the vendor
as well as my patented powercreep kit of survival pens
* FIXING IT
Having my own file is overrated
* more fixes
Still fixing it
* FINAL FORM
Fixed it.jpeg
* FINAL FIX
THIS IS FIXING BEYOND FIXING
* GO BEYOND
* IM GONNA PUNCH IT
2017-06-30 20:12:10 -07:00
CitadelStationBot and kevinz000
83da8141f4
Fixes SM getting energy when hit in space. ( #1723 )
2017-06-30 18:41:49 -07:00
CitadelStationBot
871aef4597
Show ban id to banned players
2017-06-30 14:23:05 -05:00
CitadelStationBot
4bacc78e26
Automatic changelog generation for PR #1836 [ci skip]
2017-06-30 10:48:58 -05:00
LetterJay and GitHub
51c95b89c9
Merge pull request #1836 from Citadel-Station-13/upstream-merge-28916
...
[MIRROR] Heartbeat fix
2017-06-30 10:48:57 -05:00
LetterJay and GitHub
735b25c6e3
Merge branch 'master' into upstream-merge-28916
2017-06-30 10:36:11 -05:00
LetterJay and GitHub
0390dce2e6
Update heart.dm
2017-06-30 10:35:24 -05:00
kevinz000