Commit Graph

7519 Commits

Author SHA1 Message Date
Crazy Lemon 7687d3775f Merge pull request #6859 from Fox-McCloud/so-scarry
Removes "Scarry Sounds" Random Loop
2017-03-30 18:36:57 -07:00
Fox McCloud b4e512d259 Merge pull request #6962 from davipatury/effect-to-structure
Ports /tg/ obj damage system - Part 1
2017-03-30 17:34:26 -04:00
davipatury 1673340c2d effect/effect/foam to structure/foam 2017-03-30 10:48:16 -03:00
KasparoVy 162f5602b1 Unique variable name.
For better readability.
2017-03-28 23:04:45 -04:00
KasparoVy 11953761fa Advanced Alcoholism
You can now click-drag drink containers onto yourself to start chugging.
2017-03-28 22:57:01 -04:00
Fox McCloud 00d8a089cd Merge pull request #6953 from tigercat2000/airlocks_ree
Completely remove second power/backup wire from airlocks.
2017-03-28 18:57:03 -04:00
Fox McCloud 44c17bc174 Merge pull request #6958 from KasparoVy/VoxBones2
Vox take 20% more brute damage. Fragile bird bones!
2017-03-28 18:55:16 -04:00
KasparoVy 63564653bb Skrell can now choose undergarments. 2017-03-28 17:25:51 -04:00
davipatury 8963e96c41 effect/spider to structure/spider 2017-03-27 19:01:25 -03:00
davipatury 82bfd6e4b3 effect/spacevine to structure/spacevine 2017-03-27 18:51:08 -03:00
KasparoVy 3b999a5109 Vox take 20% more brute damage. Fragile bird bones! 2017-03-27 05:41:12 -04:00
Fox McCloud 05e73f30eb Merge pull request #6819 from KasparoVy/Kidan-Antennae-Colourable-Skrell
Kidan Antennae + Greyscaled & Darkened Skrell
2017-03-27 04:40:30 -04:00
Fox McCloud 4d18372353 Merge pull request #6925 from SamHPurp/fixes-abductors
Refactors Stool/Bed/Chair deconstruction + adds Psych's bed recipe + bug fixes
2017-03-27 04:33:30 -04:00
Fox McCloud f7f127042c Merge pull request #6679 from Kyep/terrorspiders-PR5
Terror Spiders 5 - Fixes & Tweaks II
2017-03-27 02:27:19 -04:00
Sam 8965ba9872 Misc grammatical fixes
Adds message to let people know when you're trying to yank out objects
from them
2017-03-27 06:16:24 +01:00
Tigercat2000 7d956d1500 Completely remove second power/backup wire from airlocks.
Pulsing them has been broken since commit 60994c59. Not many people know
they even exist. I figure the better solution than fixing them and
introducing a new behaviour to airlock hacking is to simply remove them
completely.
2017-03-26 17:03:41 -07:00
Fox McCloud 3e8244c244 Merge pull request #6932 from uraniummeltdown/metastation
Metastation Fixes
2017-03-26 19:34:38 -04:00
uraniummeltdown d592cf2dc2 Adds Armsky object; meeting room area icon; fixed layering of firelocks, windoors and shutters, shutter directions on meta; icon edited airlocks replaced with proper types on meta; drone console now checks area instead of oview(3); meta pod keys now work on sec pod; fixed meta command hallway vendors areas; added tiny fans to mass drivers on meta; fixed gateway doors access; fixed meta virology fridge 2017-03-25 17:10:13 +04:00
TravellingMerchant ef949d273d Cleans up the code and adds the Shellguard monitor. 2017-03-25 03:14:24 +00:00
DaveTheHeadcrab f11d53a547 Possession Tweaks (#6848) 2017-03-24 19:01:31 -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
Kyep 34e7e395f5 Fixes Terror Queen Hallucinate Spit - now quicker acting, but lasts much less time 2017-03-22 00:56:21 -07: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 657c92b80d Removes "Scarry Sounds" Random Loop 2017-03-21 20:22:54 -04:00
KasparoVy d8d95b6fd0 Kidan Antennae/Greyscaled & Darkened Skrell 2017-03-19 03:55:50 -04:00
Kyep 2552f593c8 Prevents queens laying eggs while dead 2017-03-17 03:38:08 -07:00
Markolie a99b4ece15 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix 2017-03-16 22:36:00 +01:00
Fox McCloud c6e3fe3cdb Merge pull request #6734 from uraniummeltdown/plastic
Plastic is not a mineral anymore, plastic flaps can be constructed/deconstructed
2017-03-15 06:33:02 -04:00
Markolie 4edf69c3c0 Revenant nightvision fix 2017-03-12 20:59:28 +01:00
uraniummeltdown 85260a72ba plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines 2017-03-12 06:09:29 +04:00
Crazy Lemon 9de6d25f07 Merge pull request #6696 from davipatury/hallo-2
Hallucinations 2.0
2017-03-11 15:33:47 -08:00
Crazy Lemon 661939c145 Merge pull request #6691 from davipatury/rcl
Port's RCL from /vg/
2017-03-11 15:30:48 -08:00
Crazy Lemon 175a4475f0 Merge pull request #6676 from KasparoVy/TailMarkingFix
Fixes a Bug With Tail Markings
2017-03-11 15:27:57 -08:00
Fox McCloud 3c7d990061 Merge pull request #6710 from uraniummeltdown/coverflags
Cleaned up clothing flags
2017-03-11 04:57:15 -05:00
uraniummeltdown 9eb7eea1e9 removes fourth argument air_group of CanPass() as it's not used and is a leftover from FEA 2017-03-10 22:46:02 +04:00
Markolie 0bc0a2c461 All types of crystals 2017-03-10 12:45:47 +01:00
Markolie cf4f350a79 Let matter grippers carry firelock electronics and bluespace crystals 2017-03-10 12:44:37 +01:00
uraniummeltdown dd12fbe13a new flags_cover var for clothes, adjust existing flags 2017-03-10 11:33:42 +04:00
Kyep e848601bc8 Fixes annoying glare spam 2017-03-09 23:24:11 -08:00
Markolie a376adc93e Merge branch 'zefix' of https://github.com/Markolie/Paradise into zefix 2017-03-09 17:42:21 +01:00
Markolie 7cb52433d1 Fix AI blind issue 2017-03-09 17:41:46 +01:00
Mark van Alphen 93470e3570 Merge branch 'master' into zefix 2017-03-09 17:20:31 +01:00
davipatury 2a9bcde361 Fix conflicts. 2017-03-09 12:01:50 -03:00
Kyep 3211fb7896 Fixes a bug with <50% health reds 2017-03-08 04:58:21 -08:00
Kyep ce5ba21f8a Fixes two ventsmash bugs
Vent / Scrubber smashing now notifies people around the vent/scrubber,
and takes 4 seconds.
2017-03-08 03:33:27 -08:00
Markolie acab5d5170 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz
# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/game/objects/items/weapons/storage/uplink_kits.dm
#	code/game/objects/items/weapons/storage/wallets.dm
2017-03-08 10:45:16 +01:00
Crazy Lemon 6e7338a573 Merge pull request #6688 from Allfd/bible
Makes bible farting less predictable
2017-03-08 00:24:44 -08:00
Fox McCloud f96c335d1f Merge pull request #6704 from uraniummeltdown/hardsuit
Rename all "rigs" (hardsuits) to hardsuits
2017-03-07 23:35:07 -05:00
Fox McCloud 5a9ff41464 Merge pull request #6591 from Crazylemon64/ipc_power_cord
Replaces the IPC APC grabbing thing with a power cord and lets IPCs be genderless
2017-03-07 22:25:11 -05:00
uraniummeltdown dc6f9f5506 rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands 2017-03-07 20:55:43 +04:00