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
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
789064a3a5
Clean up .rej files
2017-06-28 02:24:03 -05:00
196db74cbe
Merge pull request #1714 from Citadel-Station-13/upstream-merge-28588
...
[MIRROR] Changes to the Atmos Watertank Backpack
2017-06-27 22:59:32 -05:00
e680da7de6
Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584
...
[MIRROR] Ancient Space Station [Space Spawn Ruin]
2017-06-27 21:25:50 -05:00
6a38955803
Adds container types INJECTABLE and DRAWABLE
2017-06-27 08:19:49 -05:00
bb916b6040
Merge branch 'master' into upstream-merge-28681
2017-06-27 06:16:34 -05:00
83fead2492
Merge pull request #1673 from Citadel-Station-13/upstream-merge-28567
...
[MIRROR] Refactors PDA cartridge permissions
2017-06-27 06:14:42 -05:00
f85de2ddd5
Update PDA_types.dm
2017-06-27 05:58:34 -05:00
2158ea1e67
Merge branch 'master' into upstream-merge-28681
2017-06-27 05:14:45 -05:00
8875fbefc5
Delete cart.dm.rej
2017-06-27 05:12:25 -05:00
9d6dec8975
Update cart.dm
2017-06-27 05:12:05 -05:00
163bcf0189
Delete PDA.dm.rej
2017-06-27 05:11:20 -05:00
926589fd58
Update PDA.dm
2017-06-27 05:11:06 -05:00
914434891a
Merge pull request #1744 from Citadel-Station-13/upstream-merge-28685
...
[MIRROR] Fixes the sprite for the nullrod clown dagger skin
2017-06-26 10:52:21 -05:00
090b8b5055
Merge pull request #1768 from Citadel-Station-13/upstream-merge-28740
...
[MIRROR] Station Engineers Spawn With Industrial Welder
2017-06-26 10:51:51 -05:00
b16aa00517
Small jungle trees
2017-06-26 09:42:52 -05:00
d3c2f5aee6
Merge pull request #1778 from Citadel-Station-13/upstream-merge-28766
...
[MIRROR] Robotic legs are not weak to glass shards
2017-06-26 06:26:46 -05:00
2fc5c3785a
Merge pull request #1782 from Citadel-Station-13/upstream-merge-28789
...
[MIRROR] Fixes resin attack message
2017-06-26 06:18:36 -05:00
f1937eb1fc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-06-26 06:14:55 -05:00
5571cca37c
.rej cleanup
2017-06-26 06:14:42 -05:00
faa0849b4b
Merge pull request #1663 from Citadel-Station-13/upstream-merge-28573
...
[MIRROR] Alien closets now correctly cost two alloy to make (Fixes #28561 )
2017-06-26 06:13:59 -05:00
04dd1ffdbd
Fixes resin attack message
2017-06-26 06:03:44 -05:00
b4473bedb2
Merge pull request #1636 from Citadel-Station-13/upstream-merge-28382
...
[MIRROR] Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen.
2017-06-26 05:57:59 -05:00
ed6c0b042e
Merge pull request #1508 from Citadel-Station-13/upstream-merge-28227
...
[MIRROR] Clown Toy Box + Wooden Crates
2017-06-26 04:29:08 -05:00
1982321419
Robotic legs are not weak to glass shards
2017-06-25 23:47:38 -05:00
d4c54bb0b5
Ancient Space Station [Space Spawn Ruin]
2017-06-25 11:03:27 -05:00
0c2bf7e5ea
Station Engineers Spawn With Industrial Welder
2017-06-25 09:17:52 -05:00
acc03ae85e
Fixes bad del runtime
2017-06-24 11:48:05 -05:00
2259f604d6
Merge pull request #1749 from Citadel-Station-13/upstream-merge-28659
...
[MIRROR] Intercoms are now constructable
2017-06-23 22:54:27 -05:00
68d8b76dec
PDA Refactor Part 1: Phantom Blood Menace
2017-06-23 21:59:22 -05:00
2530d8a09a
Intercoms are now constructable
2017-06-23 13:40:25 -05:00
6558f31395
Adding Locker reset function
2017-06-22 23:53:02 -05:00
3d84f4bdbb
Fixes the sprite for the nullrod clown dagger skin
2017-06-22 20:07:34 -05:00
b81b9a4f61
Merge pull request #1739 from Citadel-Station-13/upstream-merge-28673
...
[MIRROR] Readds sprites for grey & nanotrasen bedsheets
2017-06-22 19:22:23 -05:00
9f52f1cea2
Merge pull request #1737 from Citadel-Station-13/upstream-merge-28486
...
[MIRROR] Stamina projectiles no longer set off grenades and flamethrowers
2017-06-22 19:21:30 -05:00
d0d1ae1e01
Readds sprites for grey & nanotrasen bedsheets
2017-06-22 11:03:26 -05:00
f919e995dc
Stamina projectiles no longer set off grenades and flamethrowers
2017-06-22 11:00:13 -05:00
c98248cf7e
Fixes swarmers dying to radiation
2017-06-22 10:59:03 -05:00
d04001c09d
another huge sync
2017-06-21 18:00:00 -05:00
d587d692c6
Flame thrower plasma tanks can be removed easily.
2017-06-21 13:21:31 -05:00
bac0b96000
Changes to the Atmos Watertank Backpack
2017-06-20 20:49:11 -05:00
b84426d8fa
Merge pull request #1712 from Citadel-Station-13/upstream-merge-28618
...
[MIRROR] Fixes shining lights into peoples eyes
2017-06-20 20:30:24 -05:00
4102d88802
Fixes shining lights into peoples eyes
2017-06-20 20:06:25 -05:00
39ad327fab
Fixes grenade belt and bandolier UI obscuring half the screen
2017-06-20 15:37:20 -05:00
f0dc32ef4f
Space cash descriptions are more descriptive ( #1651 )
2017-06-20 08:04:28 -07:00
e1c8973f82
Fixes things getting unbuckled in nullspace ( #1606 )
2017-06-20 08:04:01 -07:00
72d329cf31
Makes RADIMMUNE species incompatible with radiation based DNA injectors ( #1518 )
2017-06-20 08:00:21 -07:00
35df3ca80e
Merge pull request #1683 from Citadel-Station-13/upstream-merge-28583
...
[MIRROR] Adds framework for equip delays and adds it to the straight jacket
2017-06-20 01:30:32 -05:00
CitadelStationBot