Commit Graph

6120 Commits

Author SHA1 Message Date
Arokha Sieyes
4e6a3e6d11 Merge pull request #1030 from VOREStation/temp
Fix Tempest's Saddlebags, redo how Saddlebags Work
2017-02-23 19:32:28 -05:00
Arokha Sieyes
69097464ee Fix Tempest's Saddlebags, redo how Saddlebags Work
In the title!
2017-02-23 19:20:51 -05:00
Leshana
ed78e7dbe9 Make vore jukebox re-constructable
* Put in our own circuit board so de-constructing and re-constructing gets the same machine back.
* Polaris now has all the same icon states as we do! We don't need our own jukebox_vr.dmi anymore.
2017-02-23 18:50:50 -05:00
Leshana
3781494933 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-23 18:25:37 -05:00
Spades
789037328d Merge pull request #1007 from Yoshax/voxvoxvox
Makes Vox spawn with a fancy dancy double emergency Phoron tank
2017-02-23 12:41:37 -05:00
Anewbe
9d0fd9b866 Merge pull request #3005 from Leshana/papershredder-enhancement
Enhances the Paper Shredder
2017-02-23 11:28:28 -06:00
Yoshax
64fd611a2c Makes Vox spawn with a fancy dancy double emergency Phoron tank 2017-02-23 13:48:50 +00: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
killer653
63ae45159d Tempest item, saddle adjustments 2017-02-21 20:55:09 -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
Arokha Sieyes
c141e8b440 Merge pull request #954 from VOREStation/roguelike
Miner Minigame
2017-02-14 20:55:10 -05:00
Arokha Sieyes
e4557b0724 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-14 20:29:57 -05:00
Arokha Sieyes
cb54ebb001 Merge pull request #945 from Screemonster/tamperbugfix
bugfix in anti-tamper proc & screesuit
2017-02-14 19:17:56 -05:00
Yoshax
cad3a04113 Merge branch 'master' of https://github.com/VOREStation/VOREStation into secbalance 2017-02-14 22:03:26 +00:00
Arokha Sieyes
9988477f42 Final work on belt mining 2017-02-14 16:36:34 -05:00
Screemonster
ce28b35275 Adds Krak-B-Gone, a silicate spray for fixing windows 2017-02-14 18:29:55 +00:00
Arokha Sieyes
ff6790b174 Console percentage and sizing fixed but not button
Dunno why button dun work
2017-02-14 01:02:07 -05:00
Arokha Sieyes
85fbc527a3 Nearing playtest time 2017-02-13 20:24:54 -05:00
Yoshax
3162c723d9 Security non-lethal balance 2017-02-13 15:49:35 +00:00
Screemonster
a7ae4fd4ab bugfix in anti-tamper proc 2017-02-13 01:42:33 +00: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
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
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
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
nachomeep
c81b18b40a adds fannypacks
To custom loadout as well.
2017-02-01 18:31:49 -05:00
Cameron653
82d021eb47 Makes vox tank spawn with nitrogen instead of phoron 2017-02-01 15:59:50 -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
ccfbd7c9ac Mining outpost camera console should work now 2017-01-29 15:25:53 -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
Dhaeleena
b69dad32fb Forgot about this 2017-01-26 22:20:45 -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
Arokha Sieyes
d70d85220a Adds hypo for CMO and adds vials in chem for them to use 2017-01-24 01:47:57 -05: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
Spades
9b61d10a0a Merge pull request #837 from Cameron653/master
January Polaris Sync and various fixes
2017-01-19 00:39:08 -05:00
Spades
24504b416f Merge pull request #847 from Dhaeleena/SecurityRework
Even more map changes.
2017-01-19 00:37:01 -05:00
Anewbe
fda82d4b17 Hood tweaks 2017-01-18 17:02:01 -06:00
Dhaeleena
b81c59989b Fixes all around the map. Edited the security Storage lightly, gave the warden a new desk to hand out stuff. Security Vendor now has Police tape, peper spray, Tasers and stun revolvers. Added Shutters to the Public Gateway acces. Lots of tiny fixes and edits all over the place. 2017-01-18 07:53:20 -03: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