kevinz000
6e2bd5fef5
Update click.dm
2017-07-03 15:45:19 -07:00
LetterJay
cc3b59d9b0
Merge pull request #1866 from Citadel-Station-13/upstream-merge-28988
...
[MIRROR] Fixes pods not counting as escape
2017-07-03 17:38:04 -05:00
CitadelStationBot
f02411ad9e
[s] Makes cookie alert private ( #1865 )
2017-07-03 15:14:38 -07:00
CitadelStationBot
21ef6c18b3
Fixes pods not counting as escape
2017-07-03 17:14:27 -05:00
CitadelStationBot
793a2ce28f
Grammar and message tweaks ( #1722 )
2017-07-01 21:22:29 -07:00
CitadelStationBot
82e8b54738
Mesons work on lavaland again ( #1802 )
2017-07-01 21:21:59 -07:00
CitadelStationBot
5f6a2a999a
Chasms, asteroid turfs, basalt, and lava can no longer be made wet ( #1847 )
2017-07-01 21:21:24 -07:00
CitadelStationBot
7b89ab66a2
Fixes reskinned guns being invisible ( #1851 )
2017-07-01 21:21:03 -07:00
CitadelStationBot
ac16176c20
Fixes deathgasping while being cloned ( #1852 )
2017-07-01 21:20:47 -07:00
CitadelStationBot
73557a5e5f
Fixes cardboard tube duping ( #1854 )
2017-07-01 21:20:39 -07:00
CitadelStationBot
bb34fa8c8a
Speeds up SSoverlays
2017-07-01 13:55:20 -05:00
CitadelStationBot
c80d8af7aa
[MIRROR] Makes dressers buildable ( #1718 )
...
* Makes dressers buildable
* Delete sheet_types.dm.rej
2017-06-30 21:26:11 -07:00
katnep
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
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
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
471380aa2c
Makes movement delay calculation not round to the tick ( #1711 )
2017-06-30 21:20:26 -07:00
CitadelStationBot
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
259d773cec
Round ID is now sent to IRC ( #1706 )
2017-06-30 21:16:44 -07:00
CitadelStationBot
0c9b72f7fc
Fixes pimpin ride janicart (and other ridden vehicles) being spaceworthy ( #1707 )
2017-06-30 20:57:27 -07:00
CitadelStationBot
b5025653b6
Luxury shelter capsules' display cases no longer spawn offhand objects ( Fixes #28589 ) ( #1694 )
2017-06-30 20:57:00 -07:00
CitadelStationBot
ca2d03a082
Moves transit space to separate z level. ( #1696 )
2017-06-30 20:56:45 -07:00
CitadelStationBot
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
488f6350ed
Revert "Freezers and heaters now drop the correct materials" ( #1819 )
2017-06-30 20:49:04 -07:00
CitadelStationBot
fce1875d73
Observers can see through some alternate apperances ( #1829 )
2017-06-30 20:47:57 -07:00
CitadelStationBot
a9a2a29dd4
Fix the lobby menu not showing when the mysql connection had ghosted ( #1839 )
2017-06-30 20:47:36 -07:00
CitadelStationBot
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
01456fddf1
Fixed small spelling + punctuation errors ( #1716 )
2017-06-30 20:46:40 -07:00
CitadelStationBot
57bf6fc7ba
Machinery clears it's occupant var if removed ( #1767 )
2017-06-30 20:42:58 -07:00
CitadelStationBot
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
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
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
katnep
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
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
LetterJay
735b25c6e3
Merge branch 'master' into upstream-merge-28916
2017-06-30 10:36:11 -05:00
LetterJay
0390dce2e6
Update heart.dm
2017-06-30 10:35:24 -05:00
LetterJay
f5f168f9f6
Merge pull request #1812 from Citadel-Station-13/upstream-merge-28858
...
[MIRROR] Adds heartbeats
2017-06-30 10:31:53 -05:00
LetterJay
b3a18b4a25
Update misc.dm
2017-06-30 10:24:16 -05:00
LetterJay
cc6f626047
Update life.dm
2017-06-30 09:59:53 -05:00
LetterJay
ab48f3f67d
Update sound.dm
2017-06-30 09:58:47 -05:00
LetterJay
794a541027
Update misc.dm
2017-06-30 09:57:49 -05:00
LetterJay
ea0dd3987f
Merge pull request #1835 from Citadel-Station-13/upstream-merge-28920
...
[MIRROR] Fix IRC server check
2017-06-30 09:55:53 -05:00
LetterJay
80ed0871c0
Merge pull request #1834 from Citadel-Station-13/upstream-merge-28919
...
[MIRROR] Makes the status throttle much more sane.
2017-06-30 09:55:16 -05:00
CitadelStationBot
cea4ef905e
Tweaks how ash drake shadows look at the beginning and end of swoops
2017-06-30 09:20:24 -05:00
CitadelStationBot
c4e8b87f44
Heartbeat fix
2017-06-30 09:18:18 -05:00
CitadelStationBot
33c620d580
Fix IRC server check
2017-06-30 09:09:02 -05:00
CitadelStationBot
351511db3b
Makes the status throttle much more sane.
2017-06-30 07:52:33 -05:00
LetterJay
881acdbecc
Merge pull request #1833 from Citadel-Station-13/upstream-merge-28918
...
[MIRROR] Makes IRC pm use ckey() on target
2017-06-30 00:04:51 -05:00
LetterJay
5ac8e01f3b
should fix file extension issue with logs
2017-06-29 22:27:51 -05:00
CitadelStationBot
2312e89503
Makes IRC pm use ckey() on target
2017-06-29 22:22:21 -05:00
