Commit Graph

25254 Commits

Author SHA1 Message Date
Arokha Sieyes
ef324b60a6 Merge pull request #882 from VOREStation/stasissleep
Makes stasis bags put people to sleep
2017-01-30 12:33:55 -05:00
Arokha Sieyes
c63897e640 Merge pull request #878 from VOREStation/digestdam
Fix digestion damage variable usage
2017-01-30 12:33:16 -05:00
Arokha Sieyes
814893cf9c Merge pull request #876 from Dhaeleena/VendLogs
Lots of changes and Fluff fixes
2017-01-30 12:32:41 -05:00
Arokha Sieyes
b17e1d86ea Makes stasis bags put people to sleep
They don't, right now. It's a little weird. People are just magically cured of their pain and can talk normally, forever, as long as they are in a stasis bag. No hunger/drug effects/bleeding/organ damage progression/toxin damage/oxygen damage, etc. AAAnd can talk normally while in "stasis"? Bags op pls nerf.
2017-01-30 12:14:07 -05: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
Arokha Sieyes
6165b686dc Fix digestion damage variable usage
I was looking for who to blame for this being hardcoded and it's apparently me from a year ago??? Oops.
2017-01-28 15:48:31 -05:00
Dhaeleena
ab8d9f2af2 Nerfed the Tear Gas Granades to a more Balanced State 2017-01-28 16:45:37 -03: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
63bced3531 Properly Done the .357 flash rounds 2017-01-26 15:53:43 -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
8f6b66345c Increase transfer rate of Xenobio injector
It was not coded correctly. This "transfer_amount" variable is never set anywhere. The "trans_to_mob" reagent transfer function defaults to 1 if you don't give it something, and this proc passes the null transfer_amount to it, which is basically that. So it always transfers 1. 5 is easier to live with.
2017-01-25 16:03:02 -05: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
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
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
Screemonster
9846a23fd2 Feral critters can't into firearms 2017-01-20 04:09:46 +00: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
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
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
Spades
3cda1a9bd3 Merge pull request #839 from VOREStation/langfix
Further language implant fix
2017-01-17 01:10:38 -05:00
Cameron653
93351c47af Merge branch 'master' into master 2017-01-16 22:30:45 -05:00
Arokha Sieyes
243a732a33 Fixes Verin's trenchcoat
Forgot some lines and it should have been fluff path anyway
2017-01-16 16:12:10 -05:00
Arokha Sieyes
e4b6ace4d5 Further language implant fix
It just can't be a child of the other language implant at all.

Fixes #838
2017-01-16 15:33:01 -05:00
Cameron653
300dd33e51 Fixes the floorlength braid... again 2017-01-16 15:07:27 -05:00
killer653
712f5610fb Wickedtemp custom items
Adds a fixed sprite for Wickedtemp's health hud
Adds a custom taur sprite for Wickedtemp
2017-01-16 00:45:30 -05:00
killer653
832418c7c9 Polaris sync 2017-01-15 18:12:15 -05:00
Arokha Sieyes
4e1dd1d237 Merge pull request #835 from VOREStation/arosuit
Event medic suit
2017-01-15 17:21:08 -05:00