cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,859 Commits 6 Branches 0 Tags
4a78b144514b99dd49564ee5b8da8e91c89415b6
Commit Graph

471 Commits

Author SHA1 Message Date
Rykka
4a78b14451 Port over Roundstats System 2020-01-15 16:42:41 -07:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Hawk_v3
ba05f70db6 Merge remote-tracking branch 'upstream/master' 2020-01-13 18:37:42 +00:00
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Razgriz
2b38acc2c6 Add files via upload 2020-01-11 03:50:46 -07:00
drexample
5e01ad45a5 coding standards are my passion 2020-01-11 06:59:33 +03:00
drexample
1be4fe8b3c hooh 2020-01-11 06:42:54 +03:00
Sharkmare
f568be89d9 The cake, Serg event. (#120) 
Adds items for an event, Made by Shadowfire117 and Ketrai
 2020-01-11 00:20:57 +01:00
Heroman
c693bf558d Does virgo-side of xenoflora expansion 2020-01-09 08:30:42 +10:00
Novacat
09e10e2901 Merge pull request #6406 from VOREStation/upstream-merge-6592 
[MIRROR] Xenoflora expansion take2
 2020-01-08 17:18:49 -05:00
Ketrai
85667c2a9b adds gnomes. (#6595) 
* adds gnomes

* Makes the house nice and bright.

* copypasta error

* Odd

* makes gnomes adminspawn only.

Co-authored-by: KitKetKetrai <49008286+KitKetKetrai@users.noreply.github.com>
 2020-01-08 13:47:41 -05:00
Mechoid
ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Schnayy
cf0344d059 Merge pull request #6522 from Mechoid/BotanyAgain2 
Botany Fix, again? [Why]
 2019-11-12 16:18:35 -05:00
Atermonera
20ee2c0ed2 Merge pull request #6519 from Mechoid/BotanyBugs 
Fix Fruit Runtime
 2019-11-10 18:52:11 -05:00
Hawk_v3
f976948ce3 Merge remote-tracking branch 'upstream/master' 2019-11-07 19:54:10 +00:00
Atermonera
dda52e4410 Merge pull request #6499 from Mechoid/Dangit_reagents 
Fixfix Grown.dm runtime
 2019-10-29 17:25:25 -04:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Hawk_v3
ac61a5cc37 Merge remote-tracking branch 'upstream/master' 2019-09-19 19:54:34 +01:00
Heroman
283c913d95 Adds missing seeds to seed storage 2019-09-19 07:54:25 +10:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
Atermonera
0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00
Hawk_v3
2a73ca4304 Merge remote-tracking branch 'upstream/master' 2019-07-23 22:51:24 +01:00
Atermonera
a78cdc85cc Merge pull request #6308 from Heroman3003/kitchenfixes 
Fixes some kitchen screwery
 2019-07-22 00:43:05 -04:00
Hawk_v3
8654b6bdf4 Merge remote-tracking branch 'upstream/master' 2019-07-19 22:05:31 +01:00
Anewbe
3c21b379f6 Merge pull request #6298 from Nalarac/patch-12 
Fixes Plant Produced Stacks
 2019-07-13 15:58:19 -04:00
Hawk_v3
4668b23fea Merge remote-tracking branch 'upstream/master' 2019-07-10 01:50:50 +01:00
Anewbe
19fd2bbab1 Merge pull request #6277 from Mechoid/ActuallyAddTheSeeds 
Actually adds the new seeds to the vendors.
 2019-07-09 14:00:39 -04:00
Heroman3003
864704565c Returns logs from plants (#6274) 
* Returns logs from plants

* Returns production of planks from fruit with wood pulp
 2019-07-08 17:33:01 -04:00
Atermonera
1472642b88 Merge pull request #6262 from Mechoid/CivilianExpansion1 
Civilian Expansion 1: The Plantening
 2019-07-07 17:29:32 -04:00
Hawk_v3
f7a7183d0e Merge remote-tracking branch 'upstream/master' 2019-07-04 18:16:01 +01:00
Anewbe
02e1db9dfd Merge pull request #6261 from Heroman3003/botanfix 
Fixes atmosphere targeted mutation editing wrong plant traits
 2019-07-03 13:09:46 -04:00
Hawk_v3
c7b05c05fb Merge remote-tracking branch 'upstream/master' 2019-06-11 02:34:25 +01:00
Atermonera
88df3de3e6 Merge pull request #6195 from TheFurryFeline/TFF-Infinite-Frame-Fixy 
Infinite Frame Fixy
 2019-06-06 13:11:59 -04:00
Hawk_v3
27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01:00
Atermonera
ea2860eeb3 Merge pull request #6148 from Verkister/patch-22 
Removes melee damage from snacks.
 2019-05-03 21:56:22 -04:00
Heroman
703c27da7e Refactors shadekin 2019-04-28 15:10:06 +10:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01: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
Unknown
d24cef8c0a Hardsyncs Icons 
...It seems like the mirrorbot is not porting icon changes over properly...
 2019-03-30 15:40:06 -04:00
Anewbe
8ed384b38c Rewrites Atmospherics 2019-03-28 19:25:11 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -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
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00