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
Poojawa
789064a3a5
Clean up .rej files
2017-06-28 02:24:03 -05:00
LetterJay
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
LetterJay
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
CitadelStationBot
6a38955803
Adds container types INJECTABLE and DRAWABLE
2017-06-27 08:19:49 -05:00
LetterJay
bb916b6040
Merge branch 'master' into upstream-merge-28681
2017-06-27 06:16:34 -05:00
LetterJay
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
LetterJay
f85de2ddd5
Update PDA_types.dm
2017-06-27 05:58:34 -05:00
LetterJay
2158ea1e67
Merge branch 'master' into upstream-merge-28681
2017-06-27 05:14:45 -05:00
LetterJay
8875fbefc5
Delete cart.dm.rej
2017-06-27 05:12:25 -05:00
LetterJay
9d6dec8975
Update cart.dm
2017-06-27 05:12:05 -05:00
LetterJay
163bcf0189
Delete PDA.dm.rej
2017-06-27 05:11:20 -05:00
LetterJay
926589fd58
Update PDA.dm
2017-06-27 05:11:06 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
f1937eb1fc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-06-26 06:14:55 -05:00
LetterJay
5571cca37c
.rej cleanup
2017-06-26 06:14:42 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
CitadelStationBot
1982321419
Robotic legs are not weak to glass shards
2017-06-25 23:47:38 -05:00
CitadelStationBot
d4c54bb0b5
Ancient Space Station [Space Spawn Ruin]
2017-06-25 11:03:27 -05:00
CitadelStationBot
0c2bf7e5ea
Station Engineers Spawn With Industrial Welder
2017-06-25 09:17:52 -05:00
CitadelStationBot
acc03ae85e
Fixes bad del runtime
2017-06-24 11:48:05 -05:00
CitadelStationBot
68d8b76dec
PDA Refactor Part 1: Phantom Blood Menace
2017-06-23 21:59:22 -05:00
CitadelStationBot
2530d8a09a
Intercoms are now constructable
2017-06-23 13:40:25 -05:00
CitadelStationBot
3d84f4bdbb
Fixes the sprite for the nullrod clown dagger skin
2017-06-22 20:07:34 -05:00
CitadelStationBot
f919e995dc
Stamina projectiles no longer set off grenades and flamethrowers
2017-06-22 11:00:13 -05:00
LetterJay
d04001c09d
another huge sync
2017-06-21 18:00:00 -05:00
CitadelStationBot
d587d692c6
Flame thrower plasma tanks can be removed easily.
2017-06-21 13:21:31 -05:00
CitadelStationBot
bac0b96000
Changes to the Atmos Watertank Backpack
2017-06-20 20:49:11 -05:00
LetterJay
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
CitadelStationBot
4102d88802
Fixes shining lights into peoples eyes
2017-06-20 20:06:25 -05:00
CitadelStationBot
39ad327fab
Fixes grenade belt and bandolier UI obscuring half the screen
2017-06-20 15:37:20 -05:00
CitadelStationBot
f0dc32ef4f
Space cash descriptions are more descriptive ( #1651 )
2017-06-20 08:04:28 -07:00
CitadelStationBot
72d329cf31
Makes RADIMMUNE species incompatible with radiation based DNA injectors ( #1518 )
2017-06-20 08:00:21 -07:00
LetterJay
a63fbd9286
Merge pull request #1490 from Citadel-Station-13/upstream-merge-26965
...
[MIRROR] Ports Goonchat
2017-06-19 17:25:18 -05:00
LetterJay
a4c9dc43dd
Dufflebag => Dufflebag
2017-06-19 16:42:05 -05:00
LetterJay
52fa6e4df8
wrong way around
2017-06-19 16:25:07 -05:00
LetterJay
42368581c5
Merge branch 'master' into upstream-merge-26965
2017-06-19 15:39:01 -05:00
CitadelStationBot
1dc24668a1
Refactors PDA cartridge permissions
2017-06-19 13:57:18 -05:00
LetterJay
a544d99f9f
cleanup and commits
2017-06-19 12:35:05 -05:00
CitadelStationBot
ba0e9e8e93
Alien closets now correctly cost two alloy to make ( Fixes #28561 )
2017-06-18 20:20:49 -05:00
CitadelStationBot
9985430c31
Minor flamethrower fix ( #1579 )
2017-06-17 13:36:31 -07:00
CitadelStationBot
2fa5d08bf5
Prevents cyborgs from extruding materials ( #1463 )
2017-06-17 13:32:44 -07:00
CitadelStationBot
9301af36da
Makes RCD ammo use consistent + small speed tweaks ( #1646 )
2017-06-17 13:14:59 -07:00
CitadelStationBot
3f92d14933
Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen.
2017-06-16 20:12:20 -05:00
CitadelStationBot
8a1a4dd671
Hand drill, jaws of life, and emitter grammar tweaks
2017-06-16 15:19:22 -05:00
CitadelStationBot
ddee871df7
Good boy Robustin does a heckin inducer fix
2017-06-15 19:04:35 -05:00
