Commit Graph

6032 Commits

Author SHA1 Message Date
Neerti 561f10bced Merge pull request #3013 from Anewbe/lung_cancer
Minor smoking update
2017-02-28 21:28:27 -05:00
Anewbe 8875c5ce1f Merge pull request #3027 from VOREStation/implanters
Make implanters able to be created
2017-02-28 20:26:48 -06:00
Anewbe e93fbddd7f Merge pull request #3025 from VOREStation/toilet
Toilet fixes
2017-02-28 19:14:11 -06:00
Arokha Sieyes 50a8b94294 Make implanters able to be created
Under 'medical' in the autolathe. 1 sheet metal, 1 sheet glass (syringes were 2 sheets total so just keeping with that).
2017-02-28 16:25:55 -05:00
Arokha Sieyes bd844c0e16 Toilet fixes
Yes yes. I know.

Anyway, there's no cooldown on this so you can give someone about 800 brute in 10 seconds. A LITTLE UNUSUAL if you ask me. Also reduced it from 8 because what the hell is that toilet seat made out of? Osmium? For an armor-ignoring attack that's a little high. Also the swirlie thing was coded wrong for the do_after.
2017-02-28 01:52:57 -05:00
Anewbe a85e170ce4 Minor smoking update 2017-02-24 17:15:38 -06:00
Anewbe 3bd665d797 Merge pull request #3001 from Neerti/2/2/2017_planet_stuff
Adds framework for planetary maps
2017-02-23 15:18:03 -06:00
Anewbe 9d0fd9b866 Merge pull request #3005 from Leshana/papershredder-enhancement
Enhances the Paper Shredder
2017-02-23 11:28:28 -06:00
Leshana d7b82fc719 Added new "default_apply_parts" facility to machines to create default parts.
* Every constructable machine with a circuit board needs to create its required parts in its constructor.  These parts must be the same parts specified in the machine's circuit board, otherwise you get the wrong parts when you deconstruct.  This creates an opportunity for error which we can eliminate by reading the circuit board's part list and just adding those to the machine directly!  Plus its less tedious.
* Implemented it on the jukebox.
2017-02-22 17:28:24 -05:00
Leshana dbd3622588 Enhances the Paper Shredder
* Makes the paper shredder constructable and deconstructable.
* Switches to some new sprites which are animated!
* Machine now requires power, icons respond to power on/off etc.
2017-02-21 19:21:32 -05:00
Neerti 91dd3348c5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/2/2017_planet_stuff
# Conflicts:
#	code/modules/mob/living/carbon/human/human_movement.dm
2017-02-20 19:06:25 -05:00
Leshana 283b58e93d Fixes dragging clothing with storage onto an occupied hand
* If you mouse-drag certain items onto a hand which is already holding something, the item goes into limbo.
* The reason this happens is that the standard code handling drags is directly calling usr.u_equip, despite the comment on that proc clearly saying never to do that.  So it just throws it to limbo and the next line attempting to put it in hand does nothing becuase the hand is occupied.   Better way is to call unEquip, so the item will drop on the ground if it fails.
* Fixes https://github.com/VOREStation/VOREStation/issues/394
2017-02-09 14:49:13 -05:00
Neerti 1d9e7c8c08 works on planet stuff 2017-02-06 20:45:21 -05:00
Anewbe 47a1fe134a Merge pull request #2978 from nachomeep/master
Adds fannypacks.
2017-02-05 18:07:01 -06:00
nachomeep c2ed062b3f Fixes custom loadout and slot system. 2017-02-02 15:37:27 -05:00
Anewbe 587044275c Merge pull request #2975 from Anewbe/spider_nerf
Spiders inject fewer spiderlings
2017-02-01 21:58:26 -06:00
nachomeep c81b18b40a adds fannypacks
To custom loadout as well.
2017-02-01 18:31:49 -05:00
Anewbe fd1ade9982 Spiders inject fewer spiderlings 2017-01-31 21:57:39 -06:00
Anewbe ccfbd7c9ac Mining outpost camera console should work now 2017-01-29 15:25:53 -06:00
Anewbe db41b99d17 Adds locker contents for HoS/Warden and a medical sunglasses for CMO 2017-01-27 00:26:52 -06:00
Anewbe a6782f4371 Merge pull request #2944 from Anewbe/vox_toys
Adds and tweaks Vox toys
2017-01-26 22:42:53 -06:00
Anewbe ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
Anewbe e23f5c2dd0 Vox airtank fix 2017-01-20 18:04:12 -06:00
Anewbe f1d37c241d Light boxes should be able to hold 24 bulbs/tubes now 2017-01-19 16:05:31 -06:00
Anewbe fda82d4b17 Hood tweaks 2017-01-18 17:02:01 -06:00
Anewbe 81c8570ba8 Merge pull request #2904 from Anewbe/theUnboxingBegins
Returns the Vox, who now breath Phoron
2017-01-17 23:49:14 -05:00
Anewbe d53cfc4773 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi
2017-01-17 22:05:38 -06:00
Anewbe e63176c2e6 Tweaks some emotes 2017-01-16 18:48:00 -06:00
Anewbe 5cfc8cabc7 Fixed the attack messages from items being placed into bags 2017-01-16 17:11:42 -06:00
Anewbe 0286be65ff Ports Bay's custodial bag tweaks 2017-01-14 23:44:16 -06:00
MagmaRam e6ac388471 Merge pull request #2891 from Anewbe/cyber_scan
Robolimbs no longer show up on medical's handheld scanners
2017-01-14 14:39:18 -06:00
MagmaRam 5ffebc5e5a Merge pull request #2910 from Anewbe/flash_refix
Hugs/grabs should only miss if you're flashed
2017-01-12 17:37:25 -06:00
Anewbe 415182d3b7 Hugs/grabs should only miss if you're flashed 2017-01-10 20:59:07 -06:00
Neerti f393dafa5d Ports Bay's Journalist TV Drone
Also ports prerequisite entertainment radio frequency code.
2017-01-09 05:03:40 -05:00
Anewbe 60df31fc41 Merge pull request #2902 from Neerti/1/2/2017_circuit_permanent_revolution
Permanent Revolution Circuit DLC
2017-01-08 14:42:25 -05:00
Anewbe 2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -06:00
Anewbe 8ae0c62d60 Merge pull request #2903 from Neerti/1/4/2017_flash_tweak
Make Flashes Great Again
2017-01-05 18:34:29 -05:00
Neerti 42807003f5 Makes halloss amount scale based on flash_strength 2017-01-05 02:30:52 -05:00
Neerti a31e65782c Make Flashes Great Again
Hand-held flashes now do 30 halloss per flash, if the person lacks flash protection.
Hand-held flashes now can be used 10 times per minute instead of five, due to needing ~4 flashes to down someone.
Flash rounds do 20 halloss if the mob hit lacks flash protection.
2017-01-04 21:45:12 -05:00
Neerti 97ebf0924d Permanent Revolution Update 2017-01-04 04:41:30 -05:00
Anewbe 47f6946794 Hands should now be affected by the flash accuracy penalties 2017-01-02 21:57:13 -06:00
Anewbe c9e5cded63 Robolimbs no longer show up on medical's handheld scanners 2017-01-01 23:11:08 -06:00
Anewbe 4ef3cf7ff1 Improves QoL for universal recorders 2016-12-30 21:35:44 -06:00
MagmaRam 190a2bc70c Replaces [stack]/fifty atoms with atoms that spawn the normal stack
The stack/fifty objects were really buggy, this should fix all of that in one go.
2016-12-17 17:27:04 -06:00
MagmaRam d382cec406 Left a thing in by accident. 2016-12-01 22:42:53 -06:00
MagmaRam c5b77fcf9e Adds an implant that allows humans to speak EAL.
It's available in the loadout for 2 points.
2016-12-01 22:22:46 -06:00
Anewbe 050aa30eb1 Merge pull request #2817 from MagmaRam/defib_fix_please_make_this_the_last_one_please_god
Defibs should revive people now.
2016-11-24 13:26:03 -06:00
MagmaRam eef853393e Defibs should revive people now.
This might be an unnecessary fix, I might just have the worst luck.
But I couldn't get a defib to res in 10 tries before this,
got it on the second after.
2016-11-24 00:30:05 -06:00
Anewbe e8e0ab8762 Fixes two items not spawning properly, moves CE welder to locker 2016-11-23 16:13:55 -06:00
Anewbe ea28bc8a44 Merge pull request #2804 from Nerezza/inflatablechanges
Inflatable QoL tweaks
2016-11-22 23:26:54 -06:00