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
38,409 Commits 9 Branches 26 Tags
d2b8db26c11b5ce34ee4abc2da2c53825df0df46
Commit Graph

28364 Commits

Author SHA1 Message Date
Spades
d2b8db26c1 Merge pull request #2148 from Cameron653/NUMBING_BITE_V2 
Numbing bite v2
 2017-09-21 19:47:17 -04:00
Spades
07762f31e7 Some disorganizes changes by Aces 
- UNSC is now USDF.
- .32 is now .380 instead.
- Added giskard to random gun spawns.
- Changed oliva to be a subtype of giskard.
- Rebalanced random gun spawner and added things.
- Detective no longer spawns with a pistol. It's in your locker instead.
- `SMG_sol` is now just `sol`.
- Fixed some ammo pathing to be consistent.
- Moves Asset Protection spawn point inside the big armory at CentCom.
- Adds a door in CentCom to let the ERT area actually be reached from
CentCom's bridge.
 2017-09-21 03:22:20 -04:00
Spades
91982d3c01 Merge pull request #2170 from VOREStation/trash-pile-tweaks 
Trash pile tweaks
 2017-09-20 00:18:54 -04:00
Spades
668e718dcb Merge pull request #2169 from stobarico/Custom 
Adds Alexis's ancient wand
 2017-09-19 19:22:31 -04:00
stobarico
5ef1f50163 Fixes last line 
Duplicate, forgot to take that off after editing the code
 2017-09-18 18:32:15 -03:00
stobarico
67b3660521 De-spawns sparks 
yis
 2017-09-18 16:42:59 -03:00
Spades
2ff8f3b0e1 Response to feedback 
Dart gun is back, voice changer is gone (from this list)
 2017-09-18 03:59:06 -04:00
Spades
d5b39e97c3 Trash pile tweaks 
- Adds zip gun
- Removes dart gun (I don't know what this even does)
- Adds voice changer mask
- Removes vault moneybag (glitchy)
- Adds makeshift metal armor
- Removes press armor (confusing for SOP)
 2017-09-18 03:18:23 -04:00
Stobarico
a7e3032091 Adds sparks (and cooldown) 
FINALLY
 2017-09-18 00:58:09 -03:00
Stobarico
e1b4e0dff8 Alexis's ancient wand 
The approved application: https://forum.vore-station.net/viewtopic.php?f=26&t=1108 (It also has the images, sound and code)
 2017-09-17 20:04:48 -03:00
killer653
8193db79f2 Whoops forgot this 2017-09-17 17:02:50 -04:00
killer653
82032f399b Adds size digestion and toggleable stomach examine. 2017-09-17 16:50:27 -04:00
Cyantime
52c3f014c1 Deconflicts2 2017-09-16 19:03:28 -04:00
Cyantime
68056dd5f2 Deconflict 2017-09-16 19:00:30 -04:00
Spades
1115d2d566 Merge pull request #2166 from Neopatra/Neopatra-Taursuits 
Neopatra's taursuits
 2017-09-16 18:56:45 -04:00
Neopatra
df1a318319 Adds taur suit to the rad suit crate 
I forgot to do this. I have no longer forgotten as it is here.
 2017-09-16 17:19:17 -04:00
Neopatra
db9b91354e Adds Taur Biosuits to Medical Biosuit Crate 
Also this crate is an absolute mess can we split it into like, 2 or 3 crates at a later date? Also aware that the general suit sprite isn't 100% correct, but I figured consistency was better until I finish all of the suits (They don't have different names in game so its not very noticeable).
 2017-09-16 13:13:03 -04:00
Neopatra
f9392153e5 Adds Taur Biosuit to Security Biosuit Crate 2017-09-16 13:07:36 -04:00
Neopatra
dbefe23039 Adds Taur Voidsuits to Relevant Supply Packs 2017-09-16 13:06:10 -04:00
Neopatra
cd24d54ba5 Adds Bio/Rad/Bomb Taursuits 
Biosuits currently only fit Nagas.
 2017-09-16 13:02:15 -04:00
Neopatra
d4dc3225d8 Adds Security and Medical Taursuits 
Riot, Crowd Control, and Vey-Med Included
 2017-09-16 13:00:41 -04:00
Cyantime
49a62057c3 Constructability. 2017-09-15 21:52:35 -04:00
killer653
81f2b21ecf Merge remote-tracking branch 'PolarisSS13/master' 2017-09-15 21:35:02 -04:00
Neerti
55162bb099 Fixes Borg Lighting Conflicts 
Borg lights should be functional again.
Being on fire now makes you glow orange instead of white.  Intensity scales based on fire stacks.
 2017-09-15 21:21:27 -04:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Anewbe
377e8f15c3 Merge pull request #3838 from Cameron653/master 
Removes a comment
 2017-09-15 17:52:11 -05:00
Cameron653
2207d55e84 owo whats this 2017-09-15 18:43:43 -04:00
Belsima
fb0e4d3cf9 General uniform updates. (#3814) 
* General uniform update.

* Maps in bathrobe.

* Revert "Maps in bathrobe."

This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.

* Fixes cheongsams and maps in the bath robe.

* Removes unintentionally added sprite.

* Assorted bugfixes.
 2017-09-15 17:14:20 -05:00
Mechoid
9373917b5c Makes Prometheans process various Toxins differently. Step One. (#3815) 
* Makes Prometheans process various and base toxins differently.

* Tweak Slime jelly again
 2017-09-15 17:00:48 -05:00
Belsima
c5651146fe Adds an icon state for SWAT gloves. (#3832) 2017-09-15 16:58:47 -05:00
Cyantime
965626656b Deconflicts 2017-09-15 15:27:12 -04:00
Cyantime
562d8539af Adds thermal regulators. 2017-09-15 15:23:26 -04:00
Verkister
ad335da4a9 Makes healgurgles nourish hungry full-health prey. 
-Ya can now share yer food without having to hurk em up.
-No OP aboos additions here, the nourishment stuff was already a thing with the healgurgs although limited for damaged prey only :v
 2017-09-15 13:55:10 +03:00
Cameron653
b44c380c13 Pens and needles. Ouch. 2017-09-14 18:13:35 -04:00
killer653
37dbb666ab Adds a slowdown. 
Definitely noticable, not deliberating.
 2017-09-14 15:57:32 -04:00
killer653
e0eed41f83 Why didn't this save AHHH 2017-09-14 15:34:22 -04:00
killer653
9e4502a09b Adds numbing fangs as a trait 2017-09-14 15:33:58 -04:00
killer653
e40116374b Merge remote-tracking branch 'refs/remotes/VOREStation/master' into NUMBING_BITE_V2 2017-09-14 15:31:17 -04:00
Anewbe
0af010fd4b Merge pull request #3820 from Cameron653/MEDICAL_TAPE 
Adds medical tape
 2017-09-14 13:16:42 -05:00
Verkister
6708e45792 cleaning my hands off the lack of fluff directory mess 2017-09-14 13:32:12 +03:00
Verkister
2c2133c098 A miniscule fluff item fix too small to deserve a PR but gets one anyway 
-Makes the recent purely cosmetic fluff goggles able to be worn additionally on the extra ear slot and thus not be completely hidden by the character's hairstyles in the "up" state.
 2017-09-14 12:14:30 +03:00
Spades
60574b650d Merge pull request #2154 from Cyantime/illegal 
Makes the thermal vision NIF software illegal.
 2017-09-13 21:22:02 -04:00
Cameron653
b0bbcf83c4 Merge branch 'master' into NUMBING_BITE_V2 2017-09-13 16:16:37 -04:00
Spades
bdf5ce72f8 Merge pull request #2132 from Ketrai/master 
adds new event... solargrubs
 2017-09-13 16:09:19 -04:00
Spades
4ffab6b629 Merge pull request #2150 from Cameron653/SOULCATCHER_EXAMINE 
Allows NIF to show up on examine.
 2017-09-13 16:09:12 -04:00
Spades
d517cea2df Merge pull request #2140 from Cameron653/AIRTIGHT_SEC_GOGGLES 
Makes sec goggles airtight.
 2017-09-13 16:09:03 -04:00
Spades
0f149499a7 Merge pull request #2151 from Cameron653/DHAEL_SQUISH_CODE 
Ports insole code from old code.
 2017-09-13 16:08:52 -04:00
Spades
81f5f32764 Merge pull request #2158 from Yewmi/horny-demons 
Adds new pair of colorable demon horns to species customization
 2017-09-13 16:08:33 -04:00
Spades
3a89fa8f4e Merge pull request #2157 from Cameron653/TRASH_PILE_ADJ 
Trash pile adjustments
 2017-09-13 16:08:14 -04:00
Neerti
194188fe8d Fixes Radiator Pipes 2017-09-13 16:08:13 -04:00