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
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
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
5571cca37c
.rej cleanup
2017-06-26 06:14:42 -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
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
3d84f4bdbb
Fixes the sprite for the nullrod clown dagger skin
2017-06-22 20:07:34 -05:00
f919e995dc
Stamina projectiles no longer set off grenades and flamethrowers
2017-06-22 11:00:13 -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
39ad327fab
Fixes grenade belt and bandolier UI obscuring half the screen
2017-06-20 15:37:20 -05:00
72d329cf31
Makes RADIMMUNE species incompatible with radiation based DNA injectors ( #1518 )
2017-06-20 08:00:21 -07:00
a63fbd9286
Merge pull request #1490 from Citadel-Station-13/upstream-merge-26965
...
[MIRROR] Ports Goonchat
2017-06-19 17:25:18 -05:00
52fa6e4df8
wrong way around
2017-06-19 16:25:07 -05:00
42368581c5
Merge branch 'master' into upstream-merge-26965
2017-06-19 15:39:01 -05:00
a544d99f9f
cleanup and commits
2017-06-19 12:35:05 -05:00
9985430c31
Minor flamethrower fix ( #1579 )
2017-06-17 13:36:31 -07:00
9301af36da
Makes RCD ammo use consistent + small speed tweaks ( #1646 )
2017-06-17 13:14:59 -07:00
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
8a1a4dd671
Hand drill, jaws of life, and emitter grammar tweaks
2017-06-16 15:19:22 -05:00
ddee871df7
Good boy Robustin does a heckin inducer fix
2017-06-15 19:04:35 -05:00
ff8b2acf9e
Merge pull request #1461 from Citadel-Station-13/upstream-merge-28145
...
[MIRROR] Syndicate Uplink - Typos & Grammar mk2
2017-06-14 08:58:35 -05:00
9df28d90bf
Merge pull request #1456 from Citadel-Station-13/upstream-merge-28150
...
[MIRROR] Fixes CE's hand drill changing size
2017-06-14 08:54:05 -05:00
4c1b223248
Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
...
Selective mirror sync
2017-06-14 06:41:01 -05:00
44f4059968
Weaponizes station charters ( #1449 )
2017-06-13 13:47:17 -07:00
e9f3bc7f1e
Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones ( #1453 )
2017-06-13 13:46:20 -07:00
b464a2dc19
Merge pull request #1517 from Citadel-Station-13/upstream-merge-28113
...
[MIRROR] Adds F.R.A.M.E. cartridge
2017-06-12 12:33:04 -05:00
55d30f865b
upstream-merge-28062
2017-06-12 12:20:07 -05:00
69b2922e58
Merge pull request #1548 from Citadel-Station-13/upstream-merge-28318
...
[MIRROR] IED code cleanup
2017-06-12 12:18:26 -05:00
8b4d5cb68d
Merge pull request #1546 from Citadel-Station-13/upstream-merge-28331
...
[MIRROR] Lighters need to be on
2017-06-12 12:13:35 -05:00
024efabf09
IED code cleanup
2017-06-11 20:47:55 -05:00
ea5f6037cf
Lighters need to be on
2017-06-11 20:44:46 -05:00
dcaa6c5db4
Fixes #28182 (IED sprites are bugged)
2017-06-11 17:28:40 -05:00
e596e3eea4
missing files
2017-06-11 00:04:13 -05:00
b80a184d97
up to upstream-merge-27868
2017-06-11 00:04:00 -05:00
4bd99124de
Adds F.R.A.M.E. cartridge
2017-06-10 12:18:31 -05:00
700004e309
Update lockbox.dm
2017-06-10 09:24:03 -05:00
7189249f66
Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115
...
[MIRROR] A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals)
2017-06-10 09:01:25 -05:00
12ea900051
Merge pull request #1487 from Citadel-Station-13/upstream-merge-28189
...
[MIRROR] Fixes #8044 , being able to hold defib paddles while dead, by removing NODROP from them
2017-06-09 15:55:30 -05:00
06be53ffeb
Merge pull request #1405 from Citadel-Station-13/upstream-merge-28049
...
[MIRROR] Only human and silicon servants can help recite multi-invoker scriptures
2017-06-09 09:13:18 -05:00
d9e3699f88
Ports Goonchat
2017-06-08 16:27:56 -05:00
24bfaa9b56
Fixes #8044 , being able to hold defib paddles while dead, by removing NODROP from them
2017-06-08 10:58:31 -05:00
00790c0fdd
Merge pull request #1315 from Citadel-Station-13/upstream-merge-27866
...
[MIRROR] Makes VV'ing ID cards easier.
2017-06-08 03:43:31 -05:00
06187dd178
Syndicate Uplink - Typos & Grammar mk2
2017-06-07 14:56:22 -05:00
c759862d4b
Fixes CE's hand drill changing size
2017-06-07 14:14:18 -05:00
katnep