Commit Graph

6550 Commits

Author SHA1 Message Date
Fox-McCloud fe6481f86f Buffs Advanced Mop 2017-07-04 21:45:15 -04:00
Fox-McCloud 354cc6a987 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-04 17:17:09 -04:00
Crazy Lemon eab996d107 Merge pull request #7678 from Fox-McCloud/misc-fixes
Icon Fixes
2017-07-04 13:01:23 -07:00
Fox-McCloud 549152f498 Merge remote-tracking branch 'upstream/master' into breathing-tube 2017-07-04 15:33:53 -04:00
tigercat2000 fef7abc867 Merge pull request #7672 from Fox-McCloud/syndicate-bomb-refactor
Refactors Syndicate Bombs and Adds Chemical Bombs
2017-07-04 11:53:55 -07:00
tigercat2000 c2b3b1adaa Merge pull request #7682 from Fox-McCloud/radio-jammer
Adds Radio Jammers
2017-07-04 11:33:40 -07:00
Crazy Lemon b8d5d530b4 Merge pull request #7690 from Aurorablade/VeryImportentMedicalGear
Adds in an importent piece of medical gear
2017-07-04 11:08:56 -07:00
Crazy Lemon c69a8c4f70 Merge pull request #7677 from Aurorablade/TeleportFix
Hand Tele bug fix
2017-07-03 14:08:43 -07:00
Aurorablade 97252cd2f8 MEdicalgear 2017-07-01 22:55:40 -04:00
Fox-McCloud e1cc7e1431 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-01 20:17:16 -04:00
Fox-McCloud 05a24da2e8 The Most Non-Edgey PR Ever 2017-07-01 19:48:43 -04:00
Fox-McCloud 04b9394d34 last tweaks 2017-07-01 01:44:02 -04:00
Fox-McCloud bf7b43ded5 Merge remote-tracking branch 'upstream/master' into embedding 2017-07-01 01:03:04 -04:00
Fox-McCloud 8e9eae8341 other "radios" 2017-07-01 00:14:36 -04:00
Fox-McCloud 08c8ba569c Adds Radio Jammers 2017-06-30 18:20:21 -04:00
Fox-McCloud 426c39ef3f Icon Fixes 2017-06-30 03:21:12 -04:00
Aurorablade 70b1a0c826 bugfix 2017-06-30 03:16:12 -04:00
Fox-McCloud 5bc6e36756 helpers 2017-06-29 20:14:29 -04:00
Fox-McCloud d3b04e2638 oops 2017-06-29 20:10:13 -04:00
Fox-McCloud b664f73a68 chemical bombs 2017-06-29 20:02:27 -04:00
Kluys 04b02435fb Bob ross painting
While trying to fix my github accidentally closed https://github.com/ParadiseSS13/Paradise/pull/7629 from the shell.

Redid the entire PR.
Changes remained the same
![Image of captains office](https://puu.sh/wuWt0/4ea9796196.png)

🆑 Kluys
Add: Bob ross painting in the captains office called "calming painting".

Also changes around the entertainment monitor and light switch to accomodate.

Fix: Clown painting was named "\improper mech painting"
/ 🆑
2017-06-29 21:28:04 +02:00
Fox-McCloud e8bbe783c6 arm augments 2017-06-28 17:01:34 -04:00
Fox-McCloud 585db8ba28 Breathing Tube Augment 2017-06-27 23:02:48 -04:00
tigercat2000 2c935a9a31 Merge pull request #6940 from Citinited/pipe-dreams-travis-woo
Adds the Rapid Pipe Dispenser (RPD)
2017-06-27 13:32:59 -07:00
tigercat2000 add07e305c Merge pull request #7595 from Fox-McCloud/augmenting-and-selection
Adds in Limb Augmentation and Limb Company Selection
2017-06-27 12:28:16 -07:00
FlattestGuitar bda736fb7c Merge branch 'master' into PAIN 2017-06-27 21:18:17 +02:00
tigercat2000 fb83d58607 Merge pull request #7436 from Alexshreds/emp
Radio EMP
2017-06-27 12:02:03 -07:00
tigercat2000 13a862be02 Merge pull request #7556 from SamHPurp/couple-more-random-variants
Adds random colours on cable cuffs & crayons, and the ability for flashes to start burnt out
2017-06-27 11:41:27 -07:00
tigercat2000 46dcfe3190 Merge pull request #7619 from SamHPurp/buff-barbers
QOL improvement for antag barbers
2017-06-27 11:27:40 -07:00
Fox McCloud 30c59c3bd2 Merge pull request #7204 from Crazylemon64/tk_refactor
Tk refactor+Remote tool use
2017-06-26 16:55:04 -04:00
Citinited 8931a06936 Crazylemon changes 2017-06-24 08:08:55 +01:00
tigercat2000 4de7b36268 Merge pull request #7582 from Kyep/dust_implant_fix
Fixes dust implants
2017-06-23 23:31:15 -07:00
Crazy Lemon a66a31ee83 Merge pull request #7589 from Vivalas/master
Fixes weird offset with beds when buckled.
2017-06-23 09:26:39 -07:00
Sam b69835e0e5 buffs scissors 2017-06-23 09:36:53 +01:00
Crazylemon64 72841c9e70 Refactors TK to work a bit more consistently
Also allows remote stack manipulation shenanigans
2017-06-22 23:24:37 -07:00
Crazy Lemon 13bceae762 Merge pull request #7590 from SamHPurp/RCD-multiple-airlocks
Fixes RCDs placing multiple airlocks on a single tile
2017-06-22 17:47:42 -07:00
Vivalas 84e3ce1b9a Integrates offset better 2017-06-20 17:30:42 -05:00
Fox-McCloud f41df2ae72 Adds in Limb Augmentation and Limb Company Selection 2017-06-20 05:28:35 -04:00
Sam 89b48eaad3 Stops RCD from placing infinite airlocks on a single tile 2017-06-20 03:42:21 +01:00
Vivalas 88f32290fc Fixes bed offset 2017-06-19 20:45:20 -05:00
Fox McCloud 3e065e730e Merge pull request #7554 from SamHPurp/more-qdel-nulls
Uses more QDEL_NULLs
2017-06-19 21:14:39 -04:00
Kyep 7adf320ff1 Fixes dust implants 2017-06-18 22:28:20 -07:00
Fox McCloud 0f485fa9df Merge pull request #7562 from SamHPurp/fixes-window-completion-step
Stops multi-windoor creation
2017-06-16 19:55:51 -04:00
Sam d343c6c8cf Fixes implied src's 2017-06-16 22:03:09 +01:00
Fox McCloud a3de63e1c8 Merge pull request #7362 from TullyBurnalot/AutopsyReportProdigyChild
Adds Coroner Report Printer
2017-06-16 16:35:25 -04:00
Fox McCloud 06b4719961 Merge pull request #7529 from Aurorablade/ChaplainClothes
More Chaplain Clothes
2017-06-16 16:10:32 -04:00
Sam 9df64aadd5 Stops multi-windoor creation 2017-06-15 12:21:43 +01:00
Sam 804692d988 Adds a random option for flashes 2017-06-15 02:20:27 +01:00
Sam e3bf6e3562 Adds random option for cable cuffs too 2017-06-15 01:47:28 +01:00
Sam 911cf31635 Adds a random crayon option for map makers 2017-06-15 01:39:29 +01:00