cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,646 Commits 9 Branches 0 Tags
0a037f0fe08d65d7b298fdc97f09450e91bf417c
Commit Graph

30020 Commits

Author SHA1 Message Date
Arokha Sieyes
0a037f0fe0 Merge pull request #2755 from VOREStation/polaris-sync-2018-01-10 
Polaris Sync 2018 01 10
 2018-01-16 02:46:25 -05:00
Arokha Sieyes
8c6da18e19 Merge pull request #2754 from VOREStation/aro-colorblind 
Colorblindness Traits
 2018-01-16 02:46:10 -05:00
Arokha Sieyes
2b8063418a Merge pull request #2758 from VOREStation/aro-updateicons 
3000% human/update_icons() speed improvement
 2018-01-16 02:44:30 -05:00
Arokha Sieyes
10aabd98da POLARIS: 3000% human/update_icons() improvement 
Using overlays in lists and a mutable_appearance
 2018-01-15 21:39:47 -05:00
Arokha Sieyes
840f39cb7e Cleanup implementation of some traits 
Better implemented this way rather than with snowflake species vars (which are getting wiped on synths, so synths end up not being able to use these sometimes)
 2018-01-15 21:34:08 -05:00
Leshana
5d5f052eb7 Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10 
# Conflicts:
#	code/game/machinery/atmoalter/area_atmos_computer.dm
 2018-01-15 13:27:39 -05:00
Arokha Sieyes
737793c854 VS: Colorblindness traits 2018-01-15 03:31:58 -05:00
Arokha Sieyes
546f71d3fd POLARIS: Adds a 'alter values' proc for plane master ease of tweaking 
Setting stuff like colorblindness variety and things.
 2018-01-15 03:31:38 -05:00
Arokha Sieyes
9041853e33 Merge pull request #2753 from VOREStation/vplk-fix-photo-planes 
POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.
 2018-01-14 23:20:36 -05:00
Leshana
83562acf66 POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays. 2018-01-14 23:00:10 -05:00
Arokha Sieyes
93564bc90e Merge pull request #2751 from VOREStation/aro-altghosts 
POLARIS: Hide higher planes from alt-turf menu
 2018-01-14 22:48:51 -05:00
Arokha Sieyes
3549ca3d06 Merge pull request #2748 from VOREStation/aro-poljobs 
Shamelessly steal Polaris' Southern Cross jobs
 2018-01-14 22:48:38 -05:00
Arokha Sieyes
73d91610f0 POLARIS: Hide higher planes from alt-turf menu 
Hides things from higher planes in the alt-examine menu. Too spooky! Fixes #2749
 2018-01-14 22:22:20 -05:00
Arokha Sieyes
eb6c482794 Shamelessly steal Polaris' Southern Cross jobs 
They're whitelist only for now, good for events and adminbuse.
 2018-01-14 21:49:19 -05:00
Arokha Sieyes
ac5a41a48f POLARIS: Industrial suit material scanner 2018-01-14 20:21:53 -05:00
Arokha Sieyes
1b180a8fd3 POLARIS: The return of the material scanner overlay 2018-01-14 19:26:54 -05:00
Arokha Sieyes
bd5856adf0 POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT 2018-01-14 19:26:07 -05:00
Arokha Sieyes
60c07e348b Merge pull request #2742 from VOREStation/aro-hudwork 
Plaaaaaaanessssssss
 2018-01-14 13:08:35 -05:00
Arokha Sieyes
9a56c27c9f Merge pull request #2711 from VOREStation/aro-nifrep 
Advanced NIF Repair Tool
 2018-01-14 00:58:18 -05:00
Arokha Sieyes
8f71a052a4 VS: Planes shenanigans. Begins 'plane' work, for VS specific things. 2018-01-14 00:40:00 -05:00
Arokha Sieyes
ad74dec1c0 POLARIS: Planes shenanigans. Begins 'plane' work. 2018-01-14 00:39:59 -05:00
Arokha Sieyes
7de2b6d866 Merge pull request #2737 from VOREStation/vplk-no-holes-in-space 
Stop explosions or singularity or whatnot from ripping holes in space.
 2018-01-14 00:19:51 -05:00
Arokha Sieyes
149b582f66 Merge pull request #2727 from Suhayll/master 
Add New Dogborg model for Sec
 2018-01-14 00:17:08 -05:00
Arokha Sieyes
8dae4a6f04 Merge pull request #2725 from VOREStation/aro-bacon 
Refactor Digestion
 2018-01-14 00:07:54 -05:00
Arokha Sieyes
ec813a439a Merge pull request #2723 from VOREStation/Cameron653-patch-2 
Gives sci dogborg a sheet loader like the sciborg
 2018-01-13 23:41:45 -05:00
Arokha Sieyes
ec7ebd1650 Merge pull request #2714 from Verkister/forbiddentaurs 
Enables 2 compatibility lacking fluff taur types.
 2018-01-13 23:41:34 -05:00
Leshana
cd00f703fa Stop explosions or singularity or whatnot from ripping holes in space. 
* When we say ChangeTurf() space, we mean it.
 2018-01-13 00:02:53 -05:00
Verkister
d3485c8e74 makes drake and otie taurs dual colorable 2018-01-12 09:58:50 +02:00
Cyantime
ddf485273a vegitables 2018-01-11 22:37:23 -05:00
Isaac Erwin
890663f2e0 Renames leg cuffs to leg wraps, renames the gold ones 
Mainly to fix the inconsistent capitalization, partially to make it consistent with the names in the loadout, partially because I think they're too long to be considered a cuff.

I'd also change the pathing so that the cuffs aren't a subtype of black shoes for no apparent reason, but I'd rather not accidentally break anything.

I'm also going to take this opportunity to say that I want an all-black/grey variant of these.
 2018-01-11 07:36:37 -05:00
Valekin
faa22ceb3d Update station_vr.dm 2018-01-11 02:48:47 +02:00
Neerti
613c5984ee Merge pull request #4510 from Cyantime/varient 
Fixes 'varient'
 2018-01-10 18:36:15 -05:00
Neerti
0ce8d465f2 Merge pull request #4515 from Mechoid/Promethean_Infection_Fix 
Adds a species flag for preventing infections. Added to Prometheans and Xenos.
 2018-01-10 18:36:01 -05:00
Spades
b287a98d76 Merge pull request #2721 from VOREStation/detective-sidearm 
Some security firearm changes
 2018-01-10 11:36:57 -05:00
Arokha Sieyes
072a40dea3 Make digest_act even more generic (and contaminate) 
Now returns nutrition that should be gained, and accepts an internal_contents list and where you want subobjects placed
 2018-01-10 10:02:13 -05:00
Arokha Sieyes
449dcbb0b7 Refactor Digestion 2018-01-10 02:06:13 -05:00
Mechoid
34f2fb2f42 Adds NO_INFECT to the base Xeno species. 2018-01-09 20:18:58 -08:00
Cameron653
47671eded6 Gives them the loader like the sciborg 2018-01-09 22:16:51 -05:00
Spades
3e754620b6 Some security firearm changes 2018-01-09 20:40:51 -05:00
Arokha Sieyes
05864e06ea Merge pull request #2719 from VOREStation/aro-layer 
Make laying people be under other people
 2018-01-09 20:33:54 -05:00
Arokha Sieyes
68e7efa2b2 Merge pull request #2718 from Cyantime/boxfix 
Actually fixes snakesnack box
 2018-01-09 20:25:16 -05:00
Cyantime
be875510f3 Actually fixes snakesnack box 2018-01-09 18:51:14 -05:00
Arokha Sieyes
0bee7979d9 Make laying people be under other people 
Unsure what consequences this would have. PLEASE REVIEW. (It works fine ingame, but I can't test every object with every mob)
 2018-01-09 18:16:17 -05:00
Cyantime
81937179ec Fix snakesnack box 2018-01-09 18:06:03 -05:00
Mechoid
91be171f62 Adds a species flag for preventing infections, akin to IS_PLANT, without its other traits. 2018-01-09 12:42:20 -08:00
Leshana
7cb2555dc7 Updates misc atmospherics machinery init and destroy. 
Fixes Destroy() proc on zpipes and cryo cells gets rid of a `loc = X`
Updates remaining atmos machinery to use atmos_init
Fixes area atmos computer to use initialize() instead of spawn-in-New
 2018-01-09 15:23:17 -05:00
Leshana
807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09 
# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#
 2018-01-09 14:40:09 -05:00
Arokha Sieyes
12b8eccb09 Merge pull request #2707 from VOREStation/aro-armoryagain 
Redesigns the armory
 2018-01-09 12:04:23 -05:00
Arokha Sieyes
fafd5cb0bd Merge pull request #2710 from VOREStation/aro-nifcryo 
Despawn NIF occupants in cryo
 2018-01-09 11:56:15 -05:00
Arokha Sieyes
399da4545b Merge pull request #2712 from AbbieFland/cargo-report 
Added supply shuttle export reports
 2018-01-09 11:55:47 -05:00