a1ff07ed1f
[MIRROR] Organs for catgirls ( #1457 )
...
* Organs for catgirls
* Delete tgstation.dme.rej
* Update tgstation.dme
2017-07-05 09:12:59 -05:00
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
f02411ad9e
[s] Makes cookie alert private ( #1865 )
2017-07-03 15:14:38 -07:00
21ef6c18b3
Fixes pods not counting as escape
2017-07-03 17:14:27 -05:00
793a2ce28f
Grammar and message tweaks ( #1722 )
2017-07-01 21:22:29 -07:00
82e8b54738
Mesons work on lavaland again ( #1802 )
2017-07-01 21:21:59 -07:00
7b89ab66a2
Fixes reskinned guns being invisible ( #1851 )
2017-07-01 21:21:03 -07:00
ac16176c20
Fixes deathgasping while being cloned ( #1852 )
2017-07-01 21:20:47 -07:00
73557a5e5f
Fixes cardboard tube duping ( #1854 )
2017-07-01 21:20:39 -07:00
8627946f72
Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once ( #1753 )
2017-06-30 21:22:45 -07:00
471380aa2c
Makes movement delay calculation not round to the tick ( #1711 )
2017-06-30 21:20:26 -07:00
b5025653b6
Luxury shelter capsules' display cases no longer spawn offhand objects ( Fixes #28589 ) ( #1694 )
2017-06-30 20:57:00 -07:00
ca2d03a082
Moves transit space to separate z level. ( #1696 )
2017-06-30 20:56:45 -07:00
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
488f6350ed
Revert "Freezers and heaters now drop the correct materials" ( #1819 )
2017-06-30 20:49:04 -07:00
fce1875d73
Observers can see through some alternate apperances ( #1829 )
2017-06-30 20:47:57 -07:00
a9a2a29dd4
Fix the lobby menu not showing when the mysql connection had ghosted ( #1839 )
2017-06-30 20:47:36 -07:00
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
01456fddf1
Fixed small spelling + punctuation errors ( #1716 )
2017-06-30 20:46:40 -07:00
9d5e51777b
use_power var now uses a define to reflect it not being a bool ( #1842 )
2017-06-30 20:41:59 -07:00
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
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
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
83da8141f4
Fixes SM getting energy when hit in space. ( #1723 )
2017-06-30 18:41:49 -07:00
871aef4597
Show ban id to banned players
2017-06-30 14:23:05 -05:00
735b25c6e3
Merge branch 'master' into upstream-merge-28916
2017-06-30 10:36:11 -05:00
0390dce2e6
Update heart.dm
2017-06-30 10:35:24 -05:00
f5f168f9f6
Merge pull request #1812 from Citadel-Station-13/upstream-merge-28858
...
[MIRROR] Adds heartbeats
2017-06-30 10:31:53 -05:00
cc6f626047
Update life.dm
2017-06-30 09:59:53 -05:00
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
cea4ef905e
Tweaks how ash drake shadows look at the beginning and end of swoops
2017-06-30 09:20:24 -05:00
c4e8b87f44
Heartbeat fix
2017-06-30 09:18:18 -05:00
33c620d580
Fix IRC server check
2017-06-30 09:09:02 -05:00
2312e89503
Makes IRC pm use ckey() on target
2017-06-29 22:22:21 -05:00
6f67132f27
Fixes ninjas not getting their katana ( #1831 )
2017-06-29 18:59:13 -07:00
8edba7b74b
[s] Holodeck exploit fix ( #1830 )
2017-06-29 18:59:04 -07:00
5d220ca7cd
Merge pull request #1808 from Citadel-Station-13/upstream-merge-28870
...
[MIRROR] Fixes emergency shuttle endgame state
2017-06-29 05:58:11 -05:00
1c9a15f74d
Update emergency.dm
2017-06-29 05:07:12 -05:00
5965f220c0
Merge pull request #1810 from Citadel-Station-13/upstream-merge-28635
...
[MIRROR] Ports bay's supermatter monitor modular program
2017-06-29 04:47:17 -05:00
8cd84f7496
Update emergency.dm
2017-06-29 04:44:26 -05:00
82f33ca772
Update sm_monitor.dm
2017-06-29 04:35:35 -05:00
fbb0378072
Updates blender descriptions ( #1660 )
2017-06-28 22:14:40 -07:00
98ff55f786
Adds heartbeats
2017-06-28 14:01:39 -05:00
5c9f09dc07
Merge pull request #1807 from Citadel-Station-13/upstream-merge-28868
...
[MIRROR] Fixes lings losing organs on humanization
2017-06-28 13:58:07 -05:00
d1a77ef774
Ports bay's supermatter monitor modular program
2017-06-28 10:05:53 -05:00
1e7c986ab5
Fixes emergency shuttle endgame state
2017-06-28 08:31:55 -05:00
bdc234ea4b
Fixes lings losing organs on humanization
2017-06-28 08:31:51 -05:00
bae20af5ff
makes virology window larger
2017-06-28 08:28:44 -05:00
d2ff4f2374
Cogscarabs will now visually flip over when stunned ( #1535 )
2017-06-28 04:09:05 -05:00
ec253c4e28
[MIRROR] cryotube pod improvements ( #1681 )
...
* Bay-like cryotube pods
* Update cryo.dm
* Delete cryo.dm.rej
* Delete cryo.dm
* cryogenics.dmi
2017-06-28 04:01:35 -05:00
CitadelStationBot