Commit Graph

13050 Commits

Author SHA1 Message Date
Arokha Sieyes
c266f8a9e4 Adds vore day 2017-02-08 16:06:39 -05:00
Arokha Sieyes
d868f70567 Remove floor light toggle broadcast
Fixes #440
2017-02-08 15:13:59 -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
c49158e5ba Merge pull request #918 from Screemonster/micromecha
Adds micro-only light mech/vehicle framework, plus equipment.
2017-02-08 10:33:34 -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
Screemonster
1d57e78c1f fixes copypasta'd comments 2017-02-07 01:42:35 +00:00
Arokha Sieyes
8f18996133 This should be the other way around 2017-02-06 16:21:06 -05:00
Arokha Sieyes
935ff411a5 Adds cloneloss to DNA Injectors
Makes sense, doesn't it? Messing with your genes? Each one doubles your cloneloss, starting at 2.
2017-02-06 16:01:28 -05:00
Screemonster
2a9a4f657b Adds the gopher and equipment, better icon for weasel 2017-02-06 06:49:33 +00:00
Anewbe
47a1fe134a Merge pull request #2978 from nachomeep/master
Adds fannypacks.
2017-02-05 18:07:01 -06:00
Anewbe
7417bef794 Boots are now a subtype of shoes 2017-02-05 16:17:41 -06:00
Screemonster
931af36a2b Adds micro-only light mech/vehicle framework, plus equipment. 2017-02-05 09:04:37 +00: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
79390b6177 Adds rugged style PDAs 2017-02-04 22:42:06 -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
Cameron653
9cd1919fc6 Reverts vox change I made 2017-02-02 14:35:14 -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
Cameron653
82d021eb47 Makes vox tank spawn with nitrogen instead of phoron 2017-02-01 15:59:50 -05:00
killer653
277071532b Item path fixes and edits
1. Oxygen tank has been changed from emergency_oxygen to
emergency/oxygen. Fixed this in custom clothings and the map

2. The vending_vr had some redundant things (repeating name, desc,
product ads, icon state, icon deny, contra.) and also the securivendor
code was causing problems since it's now been ported to polaris and is
accessable on all vending machines. Commented out the securivendor
vorestation logging.
2017-02-01 15:25:45 -05:00
killer653
7d9d970a2e For some reason this didn't get pushed 2017-02-01 15:11:06 -05:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05: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
Anewbe
1b3b67b8ca Merge branch 'master' into heart_damage 2017-01-30 22:43:09 -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
Dhaeleena
7d4c47739b I swear i wont do more commits to this. Un-nerfed the grenade cuz ace likes it and the attempts to make it more balanced were kinda shit anyways. 2017-01-28 18:59:45 -03:00
Dhaeleena
ab8d9f2af2 Nerfed the Tear Gas Granades to a more Balanced State 2017-01-28 16:45:37 -03: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
Dhaeleena
b69dad32fb Forgot about this 2017-01-26 22:20:45 -03:00
Dhaeleena
d02bb69119 Requested Tweaking done. 2017-01-26 16:02:05 -03:00
Dhaeleena
d25f512e10 Small fix, Weird line that shouldnt be there is gone now. 2017-01-26 14:06:31 -03:00
Dhaeleena
2fef35d980 Lots of changes and Fluff fixes 2017-01-26 11:48:22 -03:00
Neerti
b6c170eadd Does tons of stuff, see PR for details. 2017-01-25 19:31:21 -05:00
Anewbe
6930f06030 Fixes some stuff 2017-01-25 15:59:40 -06: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
Dhaeleena
d267679d8d Security UI 2017-01-25 00:48:14 -03:00