cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 10:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,390 Commits 9 Branches 0 Tags
07762f31e7aac5136f11b59da6de791b0ccbbf30
Commit Graph

18025 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
ce49c5b758 Merge pull request #2152 from Cameron653/LOINCLOTH 
Adds a new xeno loincloth
 2017-09-13 16:07:46 -04:00
Spades
44e9d90ba4 Merge pull request #2149 from Cameron653/RAHBOOPRED_SPRITES 
Rahboopred sprites
 2017-09-13 16:07:25 -04:00
Spades
a5b7908c5d Merge pull request #2097 from kcin2001/Harpy 
New Species: Harpy
 2017-09-13 16:05:38 -04:00
Yumi (AKA Gowst)
40ab778185 Adds outward-facing demon horns 2017-09-12 23:24:50 -05:00
Anewbe
bf11fd569f Fixes the beanbag clip sprites 2017-09-12 22:02:03 -05:00
Cameron653
e39e0d352c Merge pull request #2136 from chaoko99/OHGODHIDEYOURHUSBANDS 
Prometheans can now underwear.
 2017-09-12 12:20:36 -04:00
Unknown
1bd3fcb3dc Prometheans can now wear underwear. 2017-09-12 09:06:03 -07:00
Cyantime
fdab0d8394 Makes the thermal vision NIF software illegal. 2017-09-12 11:12:44 -04:00
Mechoid
cd1c8f00ef Fixes Prometheans being unable to select secondary languages. 2017-09-11 20:09:40 -07:00
killer653
47afd1502d Adds a loincloth to the xeno loadout 2017-09-11 21:18:29 -04:00
Anewbe
7cc1506901 Merge pull request #3810 from Mechoid/Dart_Gun_2_Dart_Harder 
Fixes the Dartgun, makes a Research-Produceable variant.
 2017-09-11 17:38:19 -04:00
Anewbe
d9b8e1dc0d Merge pull request #3799 from ghost/genderlessblobs 
Adds a non-gendered biological option for prometheans.
 2017-09-11 17:26:25 -04:00
Anewbe
096159ac37 Merge pull request #3796 from ghost/hephaestus 
Standardizes spellings to wiki and adds more major corps and places to setup.
 2017-09-11 17:19:55 -04:00
Anewbe
6ffebcef6e Merge pull request #3775 from Neerti/9/8/2017_tg_maploader_port 
Port's TG's Maploader
 2017-09-11 17:17:23 -04:00
Anewbe
21469325ac Merge pull request #3784 from ghost/woodcut 
Adds sounds for chopping wood.
 2017-09-11 14:11:46 -04:00
Ketrai
2a5605555b adds 2 more dishes 2017-09-11 19:18:11 +02:00
Ketrai
ab5aee8473 adds 2 more dishes 2017-09-11 19:18:09 +02:00
killer653
a722e20926 Removes macros 2017-09-11 11:14:29 -04:00
killer653
b8dc1460fc Adds insole code from old code. 2017-09-11 09:22:49 -04:00
Cameron653
7315a63f2e Decreases the character count from 100 -> 60 2017-09-11 08:10:16 -04:00
killer653
a7f473f5b2 Adds NIF to examination 2017-09-11 07:07:55 -04:00
Anewbe
0f5f9b3bfc Merge pull request #3778 from ghost/crossaint 
Adds croissants.
 2017-09-10 20:54:13 -04:00