Commit Graph

15619 Commits

Author SHA1 Message Date
DaveTheHeadcrab
f11d53a547 Possession Tweaks (#6848) 2017-03-24 19:01:31 -04:00
Fox McCloud
f7f91e7c15 Merge pull request #6912 from KasparoVy/underslime
Slime people can wear undergarments.
2017-03-24 18:51:50 -04:00
KasparoVy
7ecc21a4ed Slime people can wear undergarments.
I thought I'd fixed this some time ago. Hm!
2017-03-24 17:12:27 -04:00
Fox McCloud
b8ac385e48 Merge pull request #6798 from Spacemanspark/master
Adds a cancel button to the drop bomb command.
2017-03-24 03:49:53 -04:00
Tom Heeren
3dcf322115 Removes the cancel bit
Don't need this
2017-03-23 21:55:16 -05:00
Crazy Lemon
87e4993152 Merge pull request #6717 from Fox-McCloud/laser-scalpel-refactor
Fixes Power Tools Materials and Recators Laser Scalpels
2017-03-23 15:20:56 -07:00
Tom Heeren
879a8507e4 Makes code better and shit
reeeeeeeeeeeeeeeeeee
2017-03-23 16:04:12 -05:00
Fox McCloud
2ca8e10918 Merge pull request #6699 from FalseIncarnate/fish
Refactors Fish
2017-03-23 16:02:27 -04:00
Fox McCloud
b0dc4ccab2 Merge pull request #6738 from uraniummeltdown/shadowshroom
Shadowshrooms + Glowshroom Nerf + Station Lighting Nerf
2017-03-23 12:39:36 -04:00
uraniummeltdown
0f5c0e40e2 nerf station lighting along with shadowshroom glow power, fix shroom spreading, endurance fix 2017-03-23 14:12:17 +04:00
Crazy Lemon
3959313447 Merge pull request #6850 from MarsM0nd/Switch
Conveyor one direction switch
2017-03-23 01:11:11 -07:00
Crazy Lemon
9e0a4eecde Merge pull request #6858 from Fox-McCloud/autolathe-boost
Expands Autolathe Items and Enables Stock Parts
2017-03-23 00:23:27 -07:00
Fox McCloud
d62e35d333 Merge pull request #6647 from Kyep/nerf_chaplain
Nerfs Validhunting Chaplains
2017-03-23 00:18:16 -04:00
Fox McCloud
2844a024ab Merge pull request #6853 from KasparoVy/stuff
Fixes #6842, #6840 and #6839
2017-03-22 17:17:32 -04:00
Fox McCloud
04317e5eb1 Merge pull request #6855 from tigercat2000/PhantasmicDreamy
PhantasmicDream Fluff Item: Changeling Hat
2017-03-22 16:05:00 -04:00
FlattestGuitar
55bad2927a Removes Crazylemon 2017-03-22 08:19:33 +01:00
Crazy Lemon
f60dd39a9d Merge pull request #6705 from davipatury/crafting-ui
Personal Crafting Nano-UI-ification
2017-03-21 18:00:34 -07:00
Fox-McCloud
6e22561208 Expands Autolathe Items and Enables Stock Parts 2017-03-21 20:04:26 -04:00
Tigercat2000
7c2b4c5038 PhantasmicDream fluff item: Witch hat 2017-03-21 15:25:48 -07:00
KasparoVy
b589d5613a Deconstructing or depowering ORMs/MEVs ejects whatever ID is inside. 2017-03-21 17:44:18 -04:00
KasparoVy
86ddfcb5e9 Fixes Bug with PA Computer Icon
Won't render as fully constructed at the start of a round anymore. Now
shoes as an empty frame, as intended.
2017-03-21 15:42:24 -04:00
Fox McCloud
a7138189ce Merge pull request #6816 from Kyep/ahelp_PP_fix
Removes duplicate (PP) from ahelps/mhelps
2017-03-21 15:01:07 -04:00
Fox McCloud
8a257e425e Merge pull request #6789 from uraniummeltdown/playball
Baseball Bats, Baseball Burgers
2017-03-21 14:38:03 -04:00
Mars
3a5b87b00a Switching logic
Any value != 0 is true, and !0 becomes 1, so you were only able to set
the one direction to be forced, and not the other.
2017-03-21 19:18:29 +01:00
Fox McCloud
7b16c169ff Merge pull request #6494 from Crazylemon64/risky_strange_reagent
Strange Reagent is now Riskier
2017-03-21 13:11:29 -04:00
Fox McCloud
31f6bb205a Merge pull request #6814 from Jovaniph/evaspriteupdate
Tajaran EVA Suit Sprites and Minor Updates
2017-03-20 16:41:59 -04:00
KasparoVy
467c7fa1ae Fixes Glovesnipping
Attempting to snip gloves runtimed out because of that accidental
shift-key period business. Works again.
2017-03-20 05:34:25 -04:00
Fox McCloud
d0a8a3994d Merge pull request #6787 from uraniummeltdown/shippingerror
Shipping Error
2017-03-19 10:12:48 -04:00
Fox McCloud
7b4a000f4f Merge pull request #6807 from Jovaniph/voxyhatsyaya
Voxy Hats Sprites Yaya.
2017-03-19 10:03:56 -04:00
Kyep
8780933f84 Removes duplicate (PP) from ahelps/mhelps 2017-03-18 23:36:43 -07:00
Jovan
9aed97a244 Tajaran EVA Suit and some updates 2017-03-18 21:29:39 -04:00
Fox McCloud
7011cee0fb Merge pull request #6794 from FlattestGuitar/doot-doot
Admins can now stop global sounds played by other admins 🎶
2017-03-18 09:57:49 -04:00
Jovan
3fde1afd65 Vox hats yaya 2017-03-18 04:20:56 -04:00
uraniummeltdown
6d27ce0a62 added 10% chance for random crate to be added to supply shuttle on calling it to station 2017-03-18 11:19:31 +04:00
Crazy Lemon
78d8248e72 Merge pull request #6800 from Fox-McCloud/surgery-fix
Fixes Abductor Surgery
2017-03-17 15:55:23 -07:00
Fox-McCloud
991bd8c702 Fixes Abductor Surgery 2017-03-17 18:28:23 -04:00
Tom Heeren
fb4a3b0500 Makes the cancel option not forge a log. 2017-03-17 12:45:52 -05:00
Tom Heeren
1ef86a0aab Adds a cancel button to the drop bomb command.
why was this not a thing before
2017-03-17 12:34:10 -05:00
Fox McCloud
50cc0057e7 Merge pull request #6778 from FlattestGuitar/announce
Easier communications report cancelling 📣
2017-03-17 08:59:48 -04:00
Fox McCloud
b964485e08 Merge pull request #6785 from Jovaniph/unathieva
Unathi EVA Suit
2017-03-17 08:57:12 -04:00
FlattestGuitar
50460043e0 Admins can now stop global sounds played by other admins 2017-03-17 12:57:25 +01:00
Crazy Lemon
4e9236090e Merge pull request #6776 from FlattestGuitar/shoes
Ports tg's winter boots 👞
2017-03-16 17:46:27 -07:00
Crazy Lemon
5cdaa624de Merge pull request #6761 from Jovaniph/doorsounds
New sounds for Firelock, Airlock Closing, and Airlock External
2017-03-16 17:30:35 -07:00
Markolie
31e10b1b07 Flavor text fix, disabilities window popup 2017-03-16 23:51:46 +01:00
Markolie
e2a30cc7fe Preference, changeling and record fixes 2017-03-16 23:39:26 +01:00
Markolie
a99b4ece15 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix 2017-03-16 22:36:00 +01:00
uraniummeltdown
5180002295 add baseball bat item for 5 wood sheets, baseball burger, admin only reflector bat and homerun bat 2017-03-16 22:33:24 +04:00
Jovan
af62b3f3a7 Unathi EVA Suit 2017-03-16 08:25:52 -04:00
FlattestGuitar
0e4c51d6fe Easier communications report cancelling 2017-03-15 19:49:27 +01:00
FlattestGuitar
603668fb23 Adds winter boots; adds workboots to the loadout system 2017-03-15 19:45:40 +01:00