cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-25 17:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,816 Commits 9 Branches 0 Tags
c97fc22813d9efc20d6677ade482b7f23faafca1
Commit Graph

2262 Commits

Author SHA1 Message Date
Sebbe
1cf7fa2d69 Merge branch 'master' into mobpathfix 2019-04-16 11:39:01 +02:00
Sebbe
224ce6582b Hopefully fixes every path 
plz game, I didn't have fun ;w;
 2019-04-16 10:41:04 +02:00
Hawk_v3
d893b2dd24 Merge branch 'master' into map 2019-04-14 20:07:12 +01:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Hawk_v3
8d868fb890 Merge branch 'map' into RadiantMaster 2019-04-14 18:27:05 +01:00
Neerti
d2cb1f67a3 Merge pull request #6024 from Mechoid/Precursotech_Sleepers 
Precurso / Anomalotech Sleepers
 2019-04-14 01:16:46 -04:00
RadiantFlash7
025c358c84 Merge remote-tracking branch 'Repede/master' 2019-04-12 19:54:17 -04:00
Heroman3003
4d47aa5030 Unruntimes chems 2019-04-12 09:25:14 +10:00
Novacat
552cafdb47 Merge pull request #4970 from Novacat/nova-ert 
Emergency Chemistry/NanoUI/Timer subsystem fixes
 2019-04-10 19:39:51 -04:00
Heroman
e811fec521 Rebalances zoom pills 2019-04-10 06:14:51 +10:00
Heroman
9e3aa54188 Rebalances zoom pills 2019-04-10 05:12:42 +10:00
Heroman
0588af5f16 Removes testing pill 2019-04-09 18:39:17 +10:00
Heroman
6cc3d0a2c4 Fixes promethean transformation 2019-04-09 18:35:50 +10:00
Unknown
26317c4017 Removes whitespace 2019-04-08 16:18:53 -04:00
Unknown
dcd2a1f606 Ports Chemistry/NanoUI Fixes Early 
Direct port of https://github.com/PolarisSS13/Polaris/pull/6039
 2019-04-08 16:15:29 -04:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
 2019-04-07 19:40:12 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Novacat
07bc5814b2 Merge pull request #4903 from Heroman3003/research-re-do 
Moves Anomaly Lab to research outpost, replaces with Chemistry set
 2019-04-04 20:52:01 -04:00
Screemonster
629318de74 Refactors regeneration of ravenous races 2019-04-04 06:46:25 +01:00
Heroman3003
80c759ca1c Finishing touches 2019-04-04 10:35:39 +10:00
mistyLuminescence
5dc4686ad9 Unidentified Auto Tweak 2: Electric Boogaloo (#5990) 
* Remakes #5983 by request.
 2019-03-31 19:19:59 -04:00
Unknown
c0a0bb63a6 Buffs Xenochimera Protein 
Because protein is a sub-type of nutriment, I am 99% certain that this is required to offset the nutriment debuff.
 2019-03-29 09:39:30 -04:00
Unknown
7515897713 Whitespace Reeeeee 2019-03-29 09:39:30 -04:00
Unknown
6465150c4e Fixes some serious spacebrain gas 2019-03-29 09:39:30 -04:00
Unknown
2265616bc5 Species Tweaks 
- Removes Reagent tags for Akula, Neverean, and Sergals, as they were not used at all.
- Adds Reagent tag for Xenochimera.
- Xenochimera now get 25% Hunger satisfaction from Nutriment (Previously 100%)
- Fixes a Xenochimera-related runtime
- Increases the heat discomfort level of Tajarans by 6 kelvin
 2019-03-29 09:39:30 -04:00
Novacat
21f4479636 Merge branch 'master' into upstream-merge-5991 2019-03-28 21:35:54 -04:00
Neerti
a928244613 Tweaks Daxons 2019-03-28 20:29:05 -04:00
Novacat
65cd059497 Merge pull request #4751 from VOREStation/upstream-merge-5869 
[MIRROR] Adds the Zaddat Race + Modifies pressure damage calculations
 2019-03-28 18:17:11 -04:00
Unknown
ad181e797a Conflict Resolution 
Also fixes a compiling error with previous PR
 2019-03-28 17:24:03 -04:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Unknown
62b141bbf0 Fixes compile error 2019-03-28 15:30:41 -04:00
Atermonera
f75332f455 Merge pull request #5846 from Mechoid/ChemicalsChemicalsChemicals!1 
Adds multiple organ-related chemicals.
 2019-03-28 15:28:13 -04:00
Novacat
dce3466f3b Merge pull request #4684 from VOREStation/upstream-merge-5814 
[MIRROR] [READY]Makes a bunch of processes subsystems instead
 2019-03-27 17:46:31 -04:00
Novacat
97e98dd04d Merge pull request #4682 from VOREStation/upstream-merge-5829 
[MIRROR] Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
 2019-03-27 16:37:45 -04:00
Unknown
ec19a66eff Conflict Resolution 2019-03-27 16:36:41 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Novacat
c848a07f62 Merge pull request #4668 from VOREStation/upstream-merge-5815 
[MIRROR] Adds eggnog drink to the game.
 2019-03-27 15:17:14 -04:00
Neerti
fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Spades
60ce08ef82 Fixes a typo that broke the saketini recipe (#5807) 
Ported from https://github.com/VOREStation/VOREStation/pull/4534
 2019-03-27 10:28:43 -04:00
Neerti
585b688709 Adds Identification System, New Autoinjectors 2019-03-27 02:25:55 -04:00
Unknown
03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Neerti
7b84411b7c Fixes drinks and adds new one. 2019-03-08 20:19:14 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Neerti
099ddeff20 Merge pull request #5815 from Heroman3003/eggnog 
Adds eggnog drink to the game.
 2019-01-12 04:29:39 -05:00
Hawk_v3
b6988c5a09 Merge remote-tracking branch 'upstream/master' 2018-12-15 19:37:28 +00:00