Commit Graph

12550 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
Leshana
860a994818 Finally fixes the autolathe/protolate lid animations.
* Protolate lid no longer bounces back and forth througout the whole build cycle.
* Autolathe lid no longer closes, snaps open, and then -nothing- until item spawns.
* Instead, the lid closes, stays closed while the item builds, then opens again.
2017-02-24 21:30: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
f0c30b2817 Fixed broken icon states on jukebox.
* Code referred to icon_state "panel_open" but was missing from the dmi.  I had a copy of it from elsewhere, so added it in.
* It wasn't calling update_icon() on New() so newly constructed jukeboxes started off looking unpowered. Fixed.
2017-02-22 17:28:08 -05:00
Neerti
6377efd763 Fixes a few things, most notably the human layering number. 2017-02-22 00:36:47 -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
Neerti
836d8dfa3f More stuff, finalizes it I hope. 2017-02-20 18:28:31 -05:00
Leshana
19efa2ae5b Jukeboxes are coded to have hackable wires, but don't respond to wirecutters or multitools. Fix that. 2017-02-15 21:06:38 -05:00
Anewbe
95a670e562 Merge pull request #2994 from Leshana/backpack-drag-issue
Fixes dragging items with storage onto an occupied hand
2017-02-14 17:00:05 -06:00
Anewbe
2eaf2c6ebb Merge pull request #2993 from VOREStation/strref-fix
Re-fix for #2312
2017-02-09 21:24:52 -06:00
Anewbe
cb0e1d784a Merge pull request #2992 from VOREStation/langlist
Updates adv scanner known_implants
2017-02-09 21:24:17 -06: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
Arokha Sieyes
258ed1f5f3 Re-fix for #2312
The implant is stored as a string-reference, not an actual pointer, so you have to use locate() to resolve it into an actual pointer to see if that matches the implant we're removing.

Fixes #2312
Fixes https://github.com/VOREStation/VOREStation/issues/196
2017-02-08 12:33:52 -05:00
Arokha Sieyes
5451ce7870 Updates adv scanner known_implants
Was showing a few as "unknown" even though one is added by every clone scan, and the other is available in loadout. Just nobody updated this here list.
2017-02-08 12:06:49 -05:00
Arokha Sieyes
f041b2a8e6 Rename mecha power cell
Sort of annoyng to have it named the same as an actual power cell, with a different max charge. If it's going to have a unique charge amount, it should have a unique name. High-cap cells are 10k, super are 20k, so this is some weird between-cell with 15k.
2017-02-07 09:37:02 -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
Anewbe
b0a2e593e1 Merge pull request #2983 from Leshana/deconstruct-fax
Fixes Issue #2982 - Deconstruction of Fax Machine
2017-02-04 23:53:35 -06:00
Anewbe
cc9cc3c77d Merge pull request #2976 from Anewbe/vox_more_vox
Further tweaks to Vox and their toys
2017-02-04 21:07:49 -06:00
Leshana
4b5615ad69 Fixes Issue #2982 - Deconstruction of Fax Machine
* Fax machine's New() was not calling `..()` and therefore `circuit` was not being changed from a type to an instance.  Thus when deconstruct proc tries to read it's properties it can't.
* A search thru code found the aifixer had the same problem. Fixed it there too.
2017-02-04 17:34:03 -05:00
nachomeep
c2ed062b3f Fixes custom loadout and slot system. 2017-02-02 15:37:27 -05:00
Arokha Sieyes
2e6d423047 Fix chocolate milk
I am a man who can appreciate his chocolate milk. Unless his chocolate milk carton is always full of normal milk due to a faulty constructor inheritance scheme that fills it with first the wrong amount of milk, then tries to fill it with more wrong milk, then finally attempts to fill the soggy milk carton with chocolate milk.
2017-02-02 15:34:34 -05:00
Anewbe
587044275c Merge pull request #2975 from Anewbe/spider_nerf
Spiders inject fewer spiderlings
2017-02-01 21:58:26 -06:00
Anewbe
cad668a72a Further tweaks to Vox and their toys 2017-02-01 21:43:21 -06:00
nachomeep
c81b18b40a adds fannypacks
To custom loadout as well.
2017-02-01 18:31:49 -05:00
Anewbe
f16ffb890d Merge pull request #2969 from Anewbe/mining_cameras
Mining outpost camera console should work now
2017-02-01 16:21:23 -06:00
Anewbe
5e0a51bb72 Merge pull request #2951 from Anewbe/antag_numbers
Heist/Merc number changes
2017-02-01 16:21:13 -06:00
Anewbe
fd1ade9982 Spiders inject fewer spiderlings 2017-01-31 21:57:39 -06:00
Anewbe
867c0ba2f4 Merge pull request #2972 from Yoshax/vending
Vending machine logging
2017-01-31 20:48:26 -06:00
Yoshax
96912ab19c more logging 2017-01-30 23:57:45 +00:00
Anewbe
ccfbd7c9ac Mining outpost camera console should work now 2017-01-29 15:25:53 -06:00
Anewbe
20213fa1ee Fixes something, I think 2017-01-28 21:27:24 -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
d8b905d30e Merge pull request #2957 from Neerti/1/19/2017_more_circuits
Electrical Revolution Circuit DLC
2017-01-26 21:46:44 -06:00
Neerti
b6c170eadd Does tons of stuff, see PR for details. 2017-01-25 19:31:21 -05:00
Yoshax
8a5b09c539 Fixes slipping + lube 2017-01-25 20:33:11 +00:00
Yoshax
90e620a493 vending machine logging 2017-01-25 17:05:53 +00:00
Anewbe
2dfd7c5d97 Dropped the required players (and hopefully number of antags) for hest/merc 2017-01-22 21:37:43 -06:00
Anewbe
8832fe647e Merge pull request #2948 from Anewbe/firedoor_access
More people can open firedoors
2017-01-21 22:38:33 -05:00
Anewbe
01afb9d170 More people can open firedoors 2017-01-21 21:19:52 -06:00
Anewbe
ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00