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,043 Commits 5 Branches 0 Tags
a0f2a06fe5298f946bc02025e4ca8fe42497db6c
Commit Graph

30324 Commits

Author SHA1 Message Date
Screemonster
a0f2a06fe5 does it more betterer and why the fuck didn't I think of this in the first place 2018-01-30 00:12:43 +00:00
Screemonster
b4cc07e218 Improves the ripley slightly 2018-01-29 15:10:04 +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
Aronai Sieyes
9d4b70a21f Merge pull request #2858 from VOREStation/aro-uncreep 
STEALTH NERFSZZZZ
 2018-01-27 21:37:44 -05:00
Arokha Sieyes
0b6e70402c STEALTH NERFSZZZZ - Removes rigs 2018-01-27 21:28:21 -05:00
Leshana
0c41ae9630 Convert ZAS "Airflow" into a subsystem plus fixes 
* Port of the "Airflow" portions of Yonaguni/EuropaStation#618
* The "airflow" part of ZAS used to be handled by a sleep'd loop.   This has the potential to bunch up and lag.  Switching to a StonedMC managed subsystem improves it.
* Fixed to ensure that zshadow mobs cannot be blown around by the wind no matter how fierce.
* Added a message to mobs informing them when their boots save them from being wind-thwapped.
* Check w_class on non-item objects if they have it defined (might as well since var/w_class is on /obj)
* Tiny optimization of c_airblock
 2018-01-27 20:31:04 -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
Arokha Sieyes
f06170d185 Sandy footstep sounds 
it's basically carpet right
 2018-01-27 19:22:01 -05: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
dddf7a1ba4 POLARIS?: Separate away mission tests 2018-01-27 14:12:20 -05:00
Arokha Sieyes
146331802e POLARIS: Icon download helper 2018-01-27 14:12:19 -05:00
Arokha Sieyes
28e4ef603e VS: Steal Southern Cross jobs with tweaks 2018-01-27 14:12:17 -05:00
Arokha Sieyes
2488ae079e VS: Gateway 'uncalibrated' change for no awaydests 2018-01-27 14:12:16 -05:00
Arokha Sieyes
67382eebd1 VS: Add some cave and desert turfs using better icons 2018-01-27 14:10:54 -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
d7e54cc0bc POLARIS: Shuttle floor decals go with the shuttle 2018-01-27 14:10:52 -05:00
Arokha Sieyes
19b2d5a338 VS: Polaris already has this, I need it now though 2018-01-27 14:10:51 -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
Aronai Sieyes
922b5b3217 Merge pull request #2846 from Verkister/gurglems 
Fixes digest_act issues with mob holders and dummy pockets
 2018-01-27 02:05:10 -05:00
Leshana
393673baa4 Merge air_master into SSair, now its all one type 2018-01-27 01:59:25 -05: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
Aronai Sieyes
aba8908d95 Merge pull request #2844 from VOREStation/vplk-fix-plating-decals 
Fix decals on plating disappearing when you put flooring on and pry it back off.
 2018-01-27 01:43:29 -05:00
Arokha Sieyes
ff285f92c2 POLARIS: Alter shuttle underturf grabbing 2018-01-26 17:17:40 -05:00
Arokha Sieyes
8a147d5a3a POLARIS: Move these defines elsewhere 2018-01-26 17:17:40 -05:00
Arokha Sieyes
20450d848c VS: Allow preloading maps from map datums in the mapping controller 2018-01-26 16:29:12 -05:00
Verkister
f726f04136 Fixes digest_act issues with mob holders and dummy pockets 2018-01-26 13:50:51 +02:00
Neerti
b2e7b88cff Switches to the Southern Cross. For real. 2018-01-26 01:17:49 -05: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
c689d7abfa Merge pull request #2842 from VOREStation/aro-pulling 
Allow pulling objects through step teleports
 2018-01-25 19:01:57 -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
716a932f26 POLARIS: Allow pulling objects through step teleports. 2018-01-25 16:44:30 -05:00
Arokha Sieyes
3140bcf8a2 Fix commlink being in loadout 2018-01-25 16:42:56 -05:00