cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 19:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,086 Commits 8 Branches 0 Tags
17723b7df679b225c66a210f94da81c06de2e735
Commit Graph

30354 Commits

Author SHA1 Message Date
Arokha Sieyes
17723b7df6 Cleans up references to assistant 
Defines the USELESS_JOB value as "Visitor"
 2018-01-31 00:55:13 -05:00
Leshana
2f459aa8c4 Fixed Occupation Pref bitflag overflow for INTERN 
* Intern was using bit 16 which evidently doesn't work because BYOND is drunk.
* Moved it to ENGSEC department flag.  These are used only for pref saving, nothing else, so oh well.
 2018-01-30 21:55:31 -05:00
Leshana
6eec4063f3 POLARIS: No string compare for assistants 2018-01-30 21:44:00 -05:00
Aronai Sieyes
89f4e00e16 Merge pull request #2902 from VOREStation/vplk-pto 
Quick bugfixes for assistant ->visitor/intern
 2018-01-30 21:25:19 -05:00
Arokha Sieyes
76a1006cfb VS: Fix bit for Pilot and lack of config at new 2018-01-30 21:16:42 -05:00
Arokha Sieyes
3031dd8afa POLARIS: No string compare for assistants 2018-01-30 21:16:41 -05:00
Aronai Sieyes
cdac98afc1 Merge pull request #2897 from VOREStation/aro-bstemple 
New Away Mission (and minor other stuff)
 2018-01-30 20:04:07 -05:00
Arokha Sieyes
5cda1d36c1 VS: Translocator blocked by certain turfs 2018-01-30 19:23:36 -05:00
Arokha Sieyes
54865f2fbe POLARIS: Call procs on areas when shuttles arrive/depart 2018-01-30 19:23:36 -05:00
Aronai Sieyes
2fc93d5a05 Merge pull request #2898 from VOREStation/aro-issue-2891 
Fixes #2891
 2018-01-30 17:41:56 -05:00
Aronai Sieyes
6c2840ef9e Merge pull request #2895 from Verkister/doofle 
Adds dufflebags and saddlebags to utility loadout.
 2018-01-30 17:41:41 -05:00
Arokha Sieyes
dcae690a6c Fixes #2891 2018-01-30 17:25:45 -05:00
Aronai Sieyes
8ef034eaeb Merge pull request #2872 from VOREStation/vplk-pto 
Removes Assistant, replaces with PTO system
 2018-01-30 16:22:21 -05:00
Aronai Sieyes
03319e4597 Merge pull request #2811 from Verkister/otiepoop 
Otie fixes and tweaks plus another new variant.
 2018-01-30 16:21:55 -05:00
Verkister
f3dc6add6c Update loadout_utility_vr.dm 2018-01-30 23:19:35 +02:00
Aronai Sieyes
dea4e7fbc7 Merge pull request #2888 from Screemonster/nosavagebeatings 
nerfs micromech punches
 2018-01-30 16:08:46 -05:00
Aronai Sieyes
9e11c63bd6 Merge pull request #2887 from Screemonster/believeitornot 
Improves the ripley slightly
 2018-01-30 16:08:23 -05:00
Verkister
85e5731713 Adds dufflebags to loadout. 
-Adds dufflebags to loadout, including normal, black(cosmetic), and department specific versions with appropriate access restrictions to utility category.
-Adds a cosmetic black duffle without the syndie speed buff.
-Moves taur saddlebags from accessories category to utility category.

Just a little preference QoL thing when you don't feel like scavenging and littering the station with discarded starter bags.
 2018-01-30 13:14:39 +02:00
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
Screemonster
34bd240fe4 nerfs micromech punches 2018-01-30 01:12:13 +00:00
Screemonster
e953708ddd FUCKING COMMENTS 2018-01-30 00:15:49 +00:00
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
Arokha Sieyes
668d14c810 No Country For Cowboys 2018-01-29 19:03:15 -05:00
KotetsuRedwood
32c4d3b10e Adds the latex maid dress to the restraints crate 
Sqqqrrrkkk crrrllkrrrrk
 2018-01-29 19:50: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
Screemonster
b4cc07e218 Improves the ripley slightly 2018-01-29 15:10:04 +00:00
Verkister
3a4d470604 disables pc grab growl while travis sucks legs over unrelated map bugs 
some minor sprite tweaks

environmental disaster time

more things

bumps front and back rest sprites one p down

Some otie tweaks plus another new variant.
-Stops idle actions on player-controlled oties.
-Disables feeding autobarf (secdonut and rng) on player-controlled oties.
-Disables friending and auto standup on petting when player-controlled.
-Adds a tamed phoron otie with collar. (no ingame access yet so beg for mins)
-Tweaks the bare standing sprites a little. (one pixel shorter with even back stripes)
 2018-01-29 09:02:48 +02:00
Arokha Sieyes
201ef9523c Removes obsolete assistant ratio code, fixes nonconstant declaration 2018-01-29 01:22:41 -05:00
Arokha Sieyes
cc353dd6e4 Revises assistant job, and defines config limitations 2018-01-28 23:38:07 -05:00
Arokha Sieyes
446e0f30e3 Configuration option for time_off 2018-01-28 23:27:21 -05:00
Arokha Sieyes
090c9bd265 Adds idle time check 2018-01-28 23:27:21 -05:00
Leshana
9ca5337c98 PTO Implementation 
* Adds SSpersist which updates people's PTO balance every 15 minutes
* Adds "Off-duty" jobs which can only be taken if you have enough PTO.
 2018-01-28 23:27:21 -05: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