cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 10 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

444 Commits

Author SHA1 Message Date
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman
ead75dbace Switches comments back to block edit 2020-02-10 15:52:29 +10:00
Heroman
8822a40adf adjust comments 2020-02-10 13:06:43 +10:00
Heroman
3e5d2abb43 Removes magic dust from random reagents accessible via randomized seeds 2020-02-10 12:53:15 +10:00
Atermonera
66b7793d25 Merge pull request #6661 from LeighKnapenberger/patch-1 
Fixes killer tomato mutation
 2020-02-01 18:08:47 -05:00
TheFurryFeline
0b10c316cc Aaa 
Typo fix to comment, ree.
 2020-01-24 11:17:30 -05:00
TheFurryFeline
41ce1ae13f No More Vines That Shrink Thee 
Changelog Notes: 

- Blacklist Macro/micro/normal cillins from list of spawnable chems in vines that can get injected into your body. This is purely for pref reasons if you don't actually like having your size changed.
 2020-01-24 10:26:11 -05:00
Atermonera
5bcb9cc934 Fix various syntactic problems 2020-01-21 01:06:04 -05: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
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
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
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
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Heroman
283c913d95 Adds missing seeds to seed storage 2019-09-19 07:54:25 +10:00
Atermonera
0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00
Atermonera
a78cdc85cc Merge pull request #6308 from Heroman3003/kitchenfixes 
Fixes some kitchen screwery
 2019-07-22 00:43:05 -04:00
Anewbe
3c21b379f6 Merge pull request #6298 from Nalarac/patch-12 
Fixes Plant Produced Stacks
 2019-07-13 15:58:19 -04: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
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
Atermonera
88df3de3e6 Merge pull request #6195 from TheFurryFeline/TFF-Infinite-Frame-Fixy 
Infinite Frame Fixy
 2019-06-06 13:11:59 -04: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
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -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
Neerti
68d1d5cce9 Merge pull request #5691 from lbnesquik/Kates-Hedgetrimmers-feature 
Remplace the plant clippers with a pair hedgetrimmers
 2018-10-30 18:37:45 -04:00
Neerti
ea6a9f2df5 Merge pull request #5690 from lbnesquik/Kates-Wax-Fix 
Fix wax appearing to be steel.
 2018-10-20 00:07:01 -04:00
Atermonera
a74ec39eed Merge pull request #5655 from lbnesquik/Kates-Wax-Fix 
Wax can stacxk
 2018-10-13 17:16:14 -04:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018 
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	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-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2018-09-27 18:01:09 -04:00
Atermonera
de65c3c643 NanoUI now processes again 2018-08-25 21:13:16 -07:00
Anewbe
c2794c571d Hopefully fixes some tool-conversion things 2018-08-03 15:13:29 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Anewbe
4cfabdc9a4 Merge pull request #5330 from Mechoid/SeedpocalypseTheFirst 
Fix #5321
 2018-06-06 18:50:34 -04:00
Mechoid
b455abf2b6 Fix https://github.com/PolarisSS13/Polaris/issues/5321 2018-06-05 20:29:59 -07:00
Anewbe
978fdd2842 Merge pull request #5309 from Heroman3003/melon-fix 
Fixed fruit salad not being make-able
 2018-05-29 14:35:57 -04:00
Heroman3003
2f0d9aab04 Fixed watermelon not having kitchen_tag 2018-05-28 09:33:10 +10:00