Commit Graph

25505 Commits

Author SHA1 Message Date
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
Arokha Sieyes
9711cf2b9d Merge pull request #867 from Dhaeleena/FleshyBits
Flesh Turfs
2017-01-24 22:37:15 -05:00
Dhaeleena
3cdf56f4c3 Flesh Turfs 2017-01-24 23:48:50 -03:00
Arokha Sieyes
ab374a35fc Disable away missions during unit testing because it never finishes aaaaaaaaaaaaa 2017-01-24 21:26:50 -05:00
Arokha Sieyes
cd3839a9cc Merge pull request #862 from VOREStation/arofluff
Aronai fluffer
2017-01-24 15:38:09 -05:00
Arokha Sieyes
3abc27114c Re-fix Verin? 2017-01-24 10:07:45 -05:00
Arokha Sieyes
45710ef8b3 Readds fed coat?? 2017-01-24 10:06:06 -05:00
Arokha Sieyes
0af7ce8b5b Icon, and removes old gun 2017-01-24 09:58:26 -05:00
Arokha Sieyes
860ce47074 All Aronai fluff change stuff except the icon 2017-01-24 09:58:18 -05: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
Arokha Sieyes
d9d4b338bd New "MKII" Hypospray
Adds a new hypospray to the game that uses 30u vials as 'mags' rather than requiring syringing.
2017-01-24 01:23:05 -05:00
Spades
d6f1102715 Merge pull request #860 from JoanRisu/Fluff_Items_worshop
Modern Federation Coats and Officer Caps
2017-01-23 21:39:54 -05:00
Spades
20b9ac6f57 Merge pull request #854 from Screemonster/moreferaltweaks
More xenochimera tweaks
2017-01-23 21:39:45 -05:00
JoanRisu
8961a73ecb Modern Federation Coats and Officer Caps 2017-01-24 01:13:41 +09:00
Anewbe
10248f7677 Syringe code cleanup 2017-01-22 23:11:54 -06:00
Anewbe
2dfd7c5d97 Dropped the required players (and hopefully number of antags) for hest/merc 2017-01-22 21:37:43 -06:00
Cameron653
885c95cc58 Update sprite_accessories_vr.dm 2017-01-22 11:01:44 -05:00
killer653
e090d45e35 Github client didn't save this. 2017-01-22 10:47:53 -05:00
killer653
4a206aabf0 Adds in inkling hair
Adds in Molenar's inkling hair (Had to be put under ears due to not
being able to ckey lock normal hair)

Adds in normal inkling hair.

Fixes #825
2017-01-22 10:40:29 -05:00
Cameron653
5d2fa0db2c Fixes #857, adds sanity check to dogborgs
Fixes #857
2017-01-22 10:22:08 -05: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
3be442e766 Merge pull request #2947 from Anewbe/surgery_things
Surgical tools will no longer cause damage on help intent
2017-01-21 22:38:25 -05:00
Anewbe
9283cbe052 Merge pull request #2946 from Anewbe/prosthetic_bits
Prosthetic organs have sprites and take emp damage properly
2017-01-21 22:38:18 -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
Anewbe
a0343133dd Merge pull request #2941 from Mechoid/Multi-SpriteSet
Allows individuals to have multiple custom Borg Sprite-Sets.
2017-01-21 19:23:36 -05:00
Anewbe
d3607df788 Prosthetic organs have sprites and take emp damage properly 2017-01-21 16:04:43 -06:00
Screemonster
fc6bf4f128 fucked up my maths 2017-01-21 21:36:51 +00:00
Screemonster
64c80a8fdf movement, logging, tweaks 2017-01-21 21:17:30 +00:00
Anewbe
e23f5c2dd0 Vox airtank fix 2017-01-20 18:04:12 -06:00
Screemonster
9846a23fd2 Feral critters can't into firearms 2017-01-20 04:09:46 +00:00
Anewbe
27ea27964e Adds and tweaks Vox toys 2017-01-19 21:28:51 -06:00
Anewbe
022ea9f15e Merge pull request #2942 from Anewbe/ribs
Broken bones work differently
2017-01-19 18:12:17 -05:00
Anewbe
f1d37c241d Light boxes should be able to hold 24 bulbs/tubes now 2017-01-19 16:05:31 -06:00
Anewbe
86077f6c1a Broken bones work differently 2017-01-19 15:32:58 -06:00
Mechoid
1363fb49c3 Allows individuals to have multiple custom borg sprite-sets without using multiple ckeys.
Small modification of robot.dm to make both custom sprite set-ings compliant with one-another.
2017-01-19 01:35:33 -08:00
Spades
edd6d713c9 Merge pull request #822 from BothNevarBackwards/attkChoose
Allows Human Type Mobs to Select a Primary Attack
2017-01-19 00:39:34 -05: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
Spades
48c95efa2b Merge pull request #849 from VOREStation/lcvend
Life crystal tweaks
2017-01-19 00:36:13 -05:00
Spades
d7c272bfa2 Merge pull request #851 from VOREStation/rigchange
Rig changes
2017-01-19 00:34:06 -05:00
Anewbe
4de1db89bf Merge pull request #2940 from Anewbe/vox_helmets
Minor Vox fixes
2017-01-18 22:51:19 -05:00
Anewbe
4c2033bf52 Vox helmet light overlay removed 2017-01-18 21:41:34 -06:00
Anewbe
cacdd56366 Merge pull request #2938 from Anewbe/chaplain_hoodie
Hood tweaks
2017-01-18 21:40:10 -05:00
Arokha Sieyes
c299c7ce22 Rig changes
Reduced armor further, removed stealth field. Paramedics probably don't need those.
2017-01-18 20:20:45 -05:00
Anewbe
c71007fa58 Xenotaser should work now 2017-01-18 17:47:38 -06:00
Anewbe
fda82d4b17 Hood tweaks 2017-01-18 17:02:01 -06:00
Arokha Sieyes
d27cef2d5e Life crystal tweaks
Adds to medical vendors (the big ones, not the wall ones), tweaks case name to be more normal. Includes in the examine text of the crystal that you can attach it to jumpsuits to remind people.
2017-01-18 11:38:04 -05: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