cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,046 Commits 5 Branches 0 Tags
8106f27e96adcb1e9e83b79ae73b23f83c81f958
Commit Graph

19526 Commits

Author SHA1 Message Date
KotetsuRedwood
8106f27e96 Adds latex maid dresses to trash piles and loadout uniforms! 
squrrrllk and other similar noises
 2018-01-30 08:44:24 +00:00
KotetsuRedwood
d1816a3eca Adds Latex Maid Dresses. 
As the title says! Also renames clothes stuff because SS13 needs jumpsuits to end with _s for some inscrutible reason
 2018-01-29 19:47:14 +00:00
Aronai Sieyes
6896784ce0 Merge pull request #2862 from VOREStation/aro-ahelp 
Allow admins to see say/emote near their own body
 2018-01-28 18:18:40 -05:00
Aronai Sieyes
6e54ea70fb Merge pull request #2863 from Verkister/naster 
Nasty contamination vocabulary update.
 2018-01-28 18:18:30 -05:00
Verkister
47285cd5e3 Update contaminate_vr.dm 2018-01-28 21:10:16 +02:00
Aronai Sieyes
30d93f99ca Merge pull request #2860 from VOREStation/polaris-sync-2018-01-27 
Polaris Sync 2018-01-27
 2018-01-28 14:08:14 -05:00
Verkister
40358bf061 Nasty contamination vocabulary update. 
-Now in even more creative flavors for digested crap!
-Also fixes a subtle blinking pixel in sludge overlay effect.
 2018-01-28 19:00:34 +02:00
Arokha Sieyes
4645f5d182 POLARIS: Allow admins to see say/emote near their own body while they are aghosted. 2018-01-28 02:56:59 -05:00
Leshana
27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27 
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
 2018-01-27 23:08:53 -05:00
Aronai Sieyes
7c7655c854 Merge pull request #2854 from Verkister/haer 
Disables our outdated hair file override.
 2018-01-27 22:19:42 -05:00
Arokha Sieyes
0b6e70402c STEALTH NERFSZZZZ - Removes rigs 2018-01-27 21:28:21 -05:00
SunnyDaise
1f80c3336d Onions, Food and Plant Tweaks (#4629) 
* Onyonyon

* Fixes Potato's and adds Changelog.
 2018-01-27 16:53:54 -08:00
Anewbe
13310d048c Makes the large size modifiers less extreme (#4631) 2018-01-27 16:53:22 -08:00
Cyantime
3b71498ddc Fixes potato reagentID (#4637) 
* Vodka can be produced again
 2018-01-27 16:52:40 -08:00
Verkister
f94a1f5d69 Disables our outdated hair file override. 
-No longer needed after Polaris had theirs updated.
 2018-01-27 22:57:29 +02:00
Aronai Sieyes
88cab44124 Merge pull request #2848 from VOREStation/aro-exploration 
Exploration Update
 2018-01-27 15:32:42 -05:00
Aronai Sieyes
aab4c7cb11 Merge pull request #2849 from Verkister/sleeperfixems 
Various borg sleeper tweaks and fixes.
 2018-01-27 15:32:33 -05:00
Aronai Sieyes
be46136060 Merge pull request #2847 from VOREStation/vplk-ss-zas 
Convert ZAS into a StonedMC Subsystem
 2018-01-27 14:14:37 -05:00
Arokha Sieyes
146331802e POLARIS: Icon download helper 2018-01-27 14:12:19 -05:00
Arokha Sieyes
2488ae079e VS: Gateway 'uncalibrated' change for no awaydests 2018-01-27 14:12:16 -05:00
Arokha Sieyes
acc0a8576f VS: Add fennecs for sandy places 2018-01-27 14:10:54 -05:00
Arokha Sieyes
b8d2766ee3 POLARIS: Sort jobs into correct departments 
Also give cargo some color
 2018-01-27 14:10:54 -05:00
Arokha Sieyes
1910940c43 VS: Remove some bad VS edits 2018-01-27 14:10:50 -05:00
Arokha Sieyes
73b3bd639b POLARIS: Shuttle connector object for lateloaded Z-levels and other stuff 2018-01-27 14:10:50 -05:00
Verkister
3feb288228 Various borg sleeper tweaks and fixes. 
-Cleans up some redundant srcs.
-Tweaks and fixes some patient update and overlay behavior.
-Makes the sleeper gurgles use damage based gains instead of big crunch after prey death. Also drastically reduces the dead mob gain.
-Moves the reduced dead mob gain back to its original non-human exclusive spot.
-Utilizes more drain proc instead of clunky cell charge hardcode.
-Removes an unbenefitical DA nerf. (can take same size stuff as janigut again. using this to gamblefeed loaded backpacks still makes you look like an idiot shooting your own foot though.)
-Makes compactor and analyzer functions a variant in base sleeper afterattack proc instead of separate subtype proc.
 2018-01-27 10:37:57 +02:00
Leshana
4c8bce00b4 Preliminary implementation of ZAS as a StonedMC subsystem. 
* Creates the SSair subsystem which replaces the Setup, Start(), and Tick() procs of air_master.
* It may be best to have SSair completely replace air_master, but for now we are having them work together.   It does completely replace the old processScheduer air ticker however.
* Remove the obsolete Setup and Tick procs.
* Adjust admin and debug verbs that dealt with some ZAS internals to work with the new implementation.
 2018-01-27 01:59:24 -05:00
Arokha Sieyes
8a147d5a3a POLARIS: Move these defines elsewhere 2018-01-26 17:17:40 -05:00
Verkister
f726f04136 Fixes digest_act issues with mob holders and dummy pockets 2018-01-26 13:50:51 +02:00
elgeonmb
3d5740c909 adds an e-reader full of news to the loadout (#4619) 
* adds an e-reader full of news to the loadout

* Political Almanac -> Pocket Newscaster
 2018-01-25 18:18:35 -06:00
Aronai Sieyes
9cab66297c Merge pull request #2831 from Cameron653/EGG 
Adds two egg implants
 2018-01-25 19:02:58 -05:00
Aronai Sieyes
5d3ae984e0 Merge pull request #2836 from VOREStation/aro-darksight 
Darksight Fix + 2 New Traits
 2018-01-25 19:02:11 -05:00
Aronai Sieyes
52fe8ba6e4 Make Darksight Great Again (#4626) 
* Polaris port of darksight adjusting

* I really need to stop doing this, don't I?
 2018-01-25 18:01:33 -06:00
Anewbe
f060cc2a1f Merge pull request #4628 from VOREStation/pol-dark-bodyglow 
Mob var for just glowing in general
 2018-01-25 16:56:05 -06:00
Arokha Sieyes
3140bcf8a2 Fix commlink being in loadout 2018-01-25 16:42:56 -05:00
Arokha Sieyes
8f19fa41c8 POLARIS: Tweak map-loading in some ways 2018-01-25 16:33:36 -05:00
Mechoid
6df90c09e3 Allows Prometheans to be cloned from their Core. (#4602) 
* Allows Prometheans to be cloned from their Core.

* Swap brain cloning dependency from the cloner to the brain itself.

* Fffffff Changelog. And to_chat.
 2018-01-24 18:19:32 -06:00
Neerti
d1e3d009e3 Merge pull request #4614 from Anewbe/wire_fix 
[Bugfix] Makes alien wire more useful
 2018-01-24 17:13:45 -05:00
Neerti
84c22eb54a Merge pull request #4620 from VOREStation/vplk-misc-fixes-2 
Miscellaneous Small Fixes II
 2018-01-24 12:32:18 -05:00
Arokha Sieyes
04d16a01cc Port of mob glowing mechanic 2018-01-24 12:09:13 -05:00
Arokha Sieyes
3d9aa41247 POLARIS: Glowing eyes species var 2018-01-24 02:01:45 -05:00
Arokha Sieyes
91e76145bb VS: Glowing Body Trait 2018-01-24 02:01:05 -05:00
Arokha Sieyes
947a59e926 POLARIS: Make eyes adjust in the dark 
Based on how dark it is, how much darksight you have, etc.
 2018-01-24 01:59:55 -05:00
Cerebulon
8ec8b89e10 Adds a bunch of food recipes from /tg/station. (#4565) 
* Adds a bunch of food from /tg/station.
With recipes adjusted for our system.
Meat Bun, Sashimi, Eggs Benedict, Baked Beans, Sugar Cookie, Berry Muffin, Booberry Muffin, Egg Roll, Fruit Salad, Egg Bowl, Pork Bowl, Tortilla, Meat Burrito, Cheese Burrito, Fuego Burrito, Nachos, Cheesy Nachos, Cuban Nachos, Pig in Blanket.
 2018-01-23 19:16:30 -08:00
Anewbe
68955e0bbb Merge pull request #4616 from AbbieFland/rust-fixes 
Fixes RUST bugs and invisible gas blocker
 2018-01-23 18:20:28 -06:00
Anewbe
20422eb932 Merge pull request #4618 from PrismaticGynoid/berryshakeBerryshake 
Makes berry milkshakes makeable
 2018-01-23 18:20:08 -06:00
Anewbe
dfa6de7a43 Merge pull request #4613 from Neerti/1/21/2018_there_is_no_ceiling 
Adds Missing Ceiling Overlay + Fixes Space on Roof
 2018-01-23 18:19:47 -06:00
Leshana
9d700f5946 Fix writing [date] on paper and printout of ref in garbage collector error message. 2018-01-23 13:24:32 -05:00
Leshana
972acdaf2c Even more GC fixes 
* Fixes /obj/machinery/atmospherics/omni mixer and filter's being GC-able
* Fixes /obj/machinery/power/sensor being GC-able
 2018-01-23 13:24:31 -05:00
Anewbe
b13148a051 Merge pull request #4610 from VOREStation/vplk-breakerbox 
Allow constructing breaker boxes in game
 2018-01-23 12:05:48 -06:00
Anewbe
2ade61ca14 Merge pull request #4589 from MisterLayne/check_mention_fix 
No longer emphasizes basic words.
 2018-01-23 12:03:59 -06:00