cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 18:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,118 Commits 7 Branches 0 Tags
ad119f676daef3dbe6cb15d701f2651291fc0eaa
Commit Graph

1961 Commits

Author SHA1 Message Date
Screemonster
d4b800d263 does the thing more betterer 2018-04-28 21:02:34 +01:00
Arokha Sieyes
6f50bce4e7 Xenochimera refactoring 2018-04-27 20:04:59 -04:00
Screemonster
6cebb30a16 Makes blenders multitoolable for grub larva 2018-04-27 08:57:25 +01:00
Arokha Sieyes
ab1351f00d Ports the medical item sounds from Bay 
A port of https://github.com/Baystation12/Baystation12/pull/21268, which adds sounds to the healing item stacks, taperolls, and hyposprays
 2018-04-25 14:39:49 -04:00
Leshana
c09412c33e Implements the Mining Equipment Vendor 
Adds the Mining Equipment Vendor machine, which sells lots of items for points earned by mining.
Enhanced the ore processor to give points for processed ore.
Added some miscellaneous items such as hyposprays for miners.
Switched mining machines to use the nice new icons.
 2018-04-24 18:18:54 -04:00
Leshana
2a4182cc8e First effort fix of the slimes integration with taur riding. 2018-04-22 15:24:48 -04:00
Heroman3003
dcbf8627ef Fixed size-affecting reagents not working when ingested 2018-04-22 08:16:09 +10:00
Leshana
6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30 
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-03-31 09:20:59 -04:00
Aronai Sieyes
7d3aec96fd Arranges lots of things into planes (#5072) 
* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic
 2018-03-28 12:59:12 -07:00
Atermonera
6adbe5537e Merge pull request #5079 from BillyBangles/they-arent-sharpies-i-swear 
Adds permanent markers
 2018-03-28 11:49:10 -07:00
Arokha Sieyes
9f4a14b171 POLARIS: Weird snacks runtime 2018-03-25 17:09:33 -04:00
Neerti
e91bb8f3b6 Merge pull request #5071 from Cameron653/patch-1 
Makes coffee milkshakes STOP KILLING PEOPLE
 2018-03-22 22:31:13 -04:00
Anewbe
3df290f46f Ports antibiotics overhaul (#5050) 
* Ports antibiotics overhaul

* Update the rest of the places "spaceacillin" is used where antibiotics is meant.

* Antibiotics port compiles
 2018-03-22 09:55:49 -07:00
Neerti
70ac478aea Merge pull request #5065 from VOREStation/vs-port-3204 
[PORT] Revamp logging for consistency
 2018-03-20 21:13:47 -04:00
Billy Bangles
05fd53ebcc adds permanent markers 
also tweaks paint recipe to use ink instead of crayons.
 2018-03-19 20:20:31 -04:00
Aronai Sieyes
5b55716779 Merge pull request #3269 from VOREStation/aro-runtimes 
Fixes several runtimes
 2018-03-18 01:41:32 -04:00
Arokha Sieyes
b5dda94cee POLARIS?: Reduce chance of cophorizine limb breaks 2018-03-17 21:55:09 -04:00
Arokha Sieyes
00a4466dc3 VS: Sometimes you use syringes on other things 2018-03-17 21:44:13 -04:00
Arokha Sieyes
14bdc519e4 POLARIS: Weird snacks runtime 2018-03-17 21:24:11 -04:00
Cameron653
36097cb31d Changes 2018-03-17 00:52:07 -04:00
Leshana
b02773a71e Merge pull request #3216 from Screemonster/hatchnow 
Makes the monstertamer/clonexadone reaction force hatching too
 2018-03-16 20:11:18 -04:00
Cameron653
981b768320 Makes a failsafe drink overdose proc 2018-03-16 13:35:20 -04:00
Leshana
a0de41f24f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15 
# Conflicts:
#	README.md
#	code/__defines/mobs.dm
#	code/__defines/subsystems.dm
#	code/_helpers/global_lists.dm
#	code/controllers/subsystems/garbage.dm
#	code/controllers/subsystems/overlays.dm
#	code/datums/datacore.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/weapons/id cards/station_ids.dm
#	code/game/objects/random/random.dm
#	code/game/turfs/simulated/floor.dm
#	code/game/turfs/simulated/floor_icon.dm
#	code/modules/awaymissions/gateway.dm
#	code/modules/client/preferences.dm
#	code/modules/ext_scripts/python.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/reagents/reagent_containers/glass.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-4.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2018-03-15 22:41:14 -04:00
Anewbe
5212fa152b Species names should now use defines 2018-03-15 20:24:45 -05:00
Arokha Sieyes
73838e0a62 POLARIS: Revamp logging to be consistent 2018-03-13 18:20:58 -04:00
Leshana
f2fff2358b Fix DEBUG: Runtime in syringes_vr.dm,17: Cannot execute null.Cut() 2018-03-11 16:56:16 -04:00
Screemonster
5749b3b2a7 Makes the monstertamer/clonexadone reaction force hatching too 2018-03-11 20:20:38 +00:00
Arokha Sieyes
2c9bdf3ae4 POLARIS: Revamp logging to be consistent 2018-03-10 17:18:09 -05:00
Mechoid
06eb3e5e47 Merge pull request #5018 from Anewbe/syringe 
Syringe adjustments
 2018-03-10 13:28:00 -08:00
Anewbe
f2da429eab Merge pull request #4980 from MisterLayne/ED_CLN 
Adds the ED-CLN
 2018-03-10 15:04:07 -06:00
Leshana
1df2ee7537 Merge pull request #3186 from VOREStation/aro-antibio 
Remove Spaceacillin
 2018-03-09 13:24:50 -05:00
Arokha Sieyes
45c91a5176 POLARIS: Spcllin code refactor, +new antibio 2018-03-09 13:11:24 -05:00
Anewbe
7ed36f51f2 Syringe adjustments 2018-03-07 18:46:50 -06:00
MisterLayne
21c9cd0a05 fixes code, and adds changelog (hope I did it right) 2018-03-06 20:52:55 -05:00
Anewbe
2d452be603 Ingested reagents act half as quickly, rather than half as well 2018-03-05 19:40:29 -06:00
Aronai Sieyes
43aa168f71 Merge pull request #3174 from VOREStation/aro-syringes 
Make syringes not require 3 clicks to inject
 2018-03-05 18:41:53 -05:00
Arokha Sieyes
8e055e9c18 VS: Move this line for syringe time change 2018-03-04 12:21:41 -05:00
Arokha Sieyes
5ece4638a9 POLARIS: Syringes inject with one click rather than three 2018-03-04 12:21:40 -05:00
Arokha Sieyes
68a5fabe11 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/game/objects/items/devices/translator.dm
#	code/game/objects/items/weapons/dna_injector.dm
#	code/modules/client/preference_setup/loadout/loadout_ears.dm
#	code/modules/mob/living/simple_animal/aliens/hivebot.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-3.dmm
 2018-03-03 13:09:57 -05:00
Anewbe
4efc7e7efe Merge pull request #4979 from Belsima/cube 
Discourages eating monkey cubes
 2018-03-01 10:32:57 -06:00
Aronai Sieyes
e982225d1a Merge pull request #3163 from VOREStation/aro-destroy-medical-forever-because-obviously-i-hate-medical-duh 
... but not borg syringes.
 2018-02-28 21:09:13 -05:00
Aronai Sieyes
48b8c6f5fb Merge pull request #3158 from VOREStation/aro-runtime 
Fix a runtime with snacks
 2018-02-28 20:55:09 -05:00
Arokha Sieyes
489634a204 ... but not borg syringes. 2018-02-28 20:53:07 -05:00
Arokha Sieyes
3004093a50 Make syringe reuse a bad idea 
Because now it can infect limbs and transfer viruses
 2018-02-28 20:03:18 -05:00
Arokha Sieyes
5d54787198 Fix a runtime with snacks 2018-02-28 15:57:07 -05:00
Aronai Sieyes
3ef3275d59 Merge pull request #3139 from VOREStation/Cameron653-patch-2 
Promethean Water Edits
 2018-02-27 21:50:38 -05:00
Aronai Sieyes
2935ec1ac8 Merge pull request #3149 from VOREStation/aro-sync 
Polaris Sync
 2018-02-27 21:48:52 -05:00
Arokha Sieyes
3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml
 2018-02-27 21:27:35 -05:00
Belsima
d8b0685d25 Discourages eating monkey cubes 2018-02-27 18:19:05 -05:00
Arokha Sieyes
f04c58f202 VS: Rewrites basically all of how bellies work 
And cleans up a ton of stuff.
 2018-02-27 13:29:45 -05:00