cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 05:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,140 Commits 9 Branches 26 Tags
2e7474858fbcec485b9bb7fcfcd2d556d0532fd2
Commit Graph

25263 Commits

Author SHA1 Message Date
Arokha Sieyes
2e7474858f Revert "Disable away missions during unit testing because it never finishes aaaaaaaaaaaaa" 
This reverts commit ab374a35fc.
 2017-01-31 02:08:25 -05:00
Arokha Sieyes
ddd8fff460 Merge pull request #883 from VOREStation/mlem 
Vorestation specific virus symptoms
 2017-01-30 21:45:24 -05:00
Arokha Sieyes
49d5ce7052 Workaround for custom_item proc 
It's incapable of spawning this belt, and apparently if I ready up before round start, it will spawn everyone who readies up in space for some reason? Orbis and I tested and aren't suuuper sure why. It's probably the belt though. So, easy solution is a box.
 2017-01-30 16:47:31 -05:00
Arokha Sieyes
724af1b63f Vorestation specific virus symptoms 
Mlem. They go in this file.
 2017-01-30 14:00:47 -05:00
Arokha Sieyes
15e0aa9131 You brought this on yourself. 
You really did. There's nobody else to blame but you.
 2017-01-30 13:57:31 -05:00
Arokha Sieyes
0008e89a5a Merge pull request #881 from OrbisAnima/swimsuits2 
Swimsuits for All! Fluff items for some
 2017-01-30 12:38:52 -05:00
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
OrbisAnima
65e8ac37ab Fluff Swimsuit minor adjustment 
Description of Xsdew item was the wrong one, sorry!
 2017-01-29 12:20:44 -03:00
OrbisAnima
5cb92eb078 Swimsuits for all! 
-Added swimsuits to be picked in the loadout, without replacing the
uniform (They spawn in a capsule, a limited box that can only hold one
swimsuit, and only a swimsuit, and cannot be turned into cardboard.)

-Added Xsdew departamental selection of Swimsuits (Security, Medbay,
Science and Engineering)

-Added Xsdew Fluff Swimsuit!

Fixes #874
 2017-01-29 11:26:32 -03:00
OrbisAnima
16a44b75bd Swimsuits for All! Fluff items for some 
-Added swimsuits to be picked in the loadout, since I created a special
container for them, they wont replace the uniform you spawn with. They
can be found in uniforms and suits!

-Added Xsdew departamental selection of swimsuits! (Security, Medbay,
Science and Engineering)

-Added Xsdew Fluff swimsuit!
 2017-01-29 11:10:00 -03: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