cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,593 Commits 8 Branches 0 Tags
8103e0c02cf194710db798937dbf65cbd692ae70
Commit Graph

393 Commits

Author SHA1 Message Date
Rykka
8103e0c02c Commit 3 2020-07-19 16:28:59 -04:00
Rykka
ed573739ae Commit 2 2020-07-19 16:27:36 -04:00
Rykka
454cfda0b6 Commit One 2020-07-19 16:24:56 -04:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
SweetBlueSylveon
9640367e88 Fixes two drinks. 
Correctly maps "Dumb Shroom Juice" and "Unsweetened Tea" to /ethanol.
 2020-05-31 01:59:34 -07:00
Aronai Sieyes
a5de42d181 Merge pull request #8140 from SweetBlueSylveon/Drink-update 
Drink update
 2020-05-30 19:09:25 -04:00
SweetBlueSylveon
2c3c8e8450 Patch 2 
Fixed indentations.
Removed "Icon_state" and "center_of_mass" where stated a second time.
 2020-05-30 15:57:03 -07:00
SweetBlueSylveon
dcdf46212c Drink update 
Adds 20 new drinks, 30 replaced sprites for old drinks, and adds 3 new sprites to drinks without one. Snow White recipe changed.
Requires"Allow reagents to have specific metaglass icon files" from Arokha.
 2020-05-30 14:55:44 -07:00
Arokha Sieyes
982f523dd4 Allow reagents to have specific metaglass icon files 2020-05-30 16:58:05 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Aronai Sieyes
1bf4a11207 Fixes smartfridge throw stock issue 2020-05-21 11:24:45 -04:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112
c14d144d45 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-18 16:05:36 +02:00
Arokha Sieyes
e91418fa6d Add protean shakes 2020-05-17 00:05:01 -04:00
izac112
bba0a05f5f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-13 10:21:49 +02:00
Nepox
0ffb4c81a0 Fixes missing sprite from Honeybuns 
It should work now.
 2020-05-12 21:14:41 +02:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Atermonera
9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -04:00
Aronai Sieyes
4a12194414 VS: Cached version of icon_states() proc 2020-05-06 16:06:48 -04:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Aronai Sieyes
ad9cdaade6 Merge pull request #7637 from VOREStation/aro-shake 
Fix protein shaker name
 2020-05-04 21:12:09 -04:00
Aronai Sieyes
fa13c1089f Fix protein shaker name 2020-05-04 21:01:06 -04:00
Aronai Sieyes
19450573fe Fix condiment container infinite range 2020-05-04 20:24:54 -04:00
Nepox
9fe34ecece Adds new food item: Honeybun 
Honeybun 2: Electrig Bogaloo

This time inside the right files- I hope.
 2020-05-01 11:45:33 +02:00
Kassc Zeravla
ac8ae9a9b3 Quick fix 
*Removed from the tea code "<<<<"
*Removed from the tea code "/*"
*Small fix on the BeanBurrito.
 2020-04-30 05:46:12 -04:00
Aronai Sieyes
b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045 
[MIRROR] Removes limits on eating, centralizes nutrition changing.
 2020-04-29 19:23:55 -04:00
Aronai Sieyes
893130bdff Merge nutrition refactor for vorestation 2020-04-29 18:34:22 -04:00
Atermonera
f1cabd6742 Removes limits on eating, centralizes nutrition changing. 2020-04-29 17:15:15 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Kassc Zeravla
94a07d5f32 Food fix and new foods 
*Fixed our old food code. (Added "/Initialize()", "/Microwave"), 
*Changed the recipe on some of our food items to make it more easy to cook.
*Added Big Bean Burrito
*Added Supremo Bean Burrito (you can hide a teshari inside!)
*Added Plump Burger
*Added Wataur
 2020-04-29 13:44:28 -04:00
Kassc Zeravla
c9a3e22221 Auto stash before merge of "master" and "origin/master" 2020-04-28 03:17:33 -04:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
Atermonera
d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
ArgobargSoup
5b21fa1ff5 Makes fish meat non-toxic, attempt number 2 2020-04-01 21:39:24 -07:00
Unknown
dca2e93209 VS: Conflict Resolution + VS Changes 
Makes soft vendors work again
Conflict Resolution II
Fixes Shelter Capsule Vendor
Note to self remember quotations
Bad Lynx stop forgetting quotes!
 2020-03-31 13:56:38 -04:00
Atermonera
a23797182f Port Bay's vendor/smartfridge sprites 2020-03-31 13:56:38 -04:00
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Atermonera
223fb23423 Merge pull request #6811 from Schnayy/mwsprites 
Deluxe microwave sprites work
 2020-03-12 03:21:45 -04:00
Cerebulon
80f7f3afb2 Adds more machine button sounds (#6802) 
* Adds more machine button sounds

* chang
 2020-03-11 20:32:06 -04:00
Atermonera
d39b10b144 Merge pull request #6803 from Schnayy/CookingUpdate1 
Cooking adjustments
 2020-03-10 18:41:02 -04:00
Shadowfire117
f5999569a9 Merge branch 'master' into casinophase2 2020-03-09 15:39:53 +01:00
Shadowfire117
1beac90488 fixes 
fixed some runtime errors with apparently lack of fixes I made earlier that I needed to redo.
changed some reagent containers which used the old New() proc instead of intialize
added gelatin and macha latte to dispenser and cartridges, might still have runtime and compile errors, but chompstation2 has the reagents implemented so wont cause issues.
 2020-03-09 13:23:35 +01:00
Repede
6e293183ad Merge branch 'release' of https://github.com/VOREStation/VOREStation into releaseupdate 
# Conflicts:
#	icons/mob/hud.dmi
 2020-03-04 08:17:38 -05:00
Novacat
f63fa398b9 Update thecake.dm 2020-03-03 16:15:54 -05:00
Schnayy
7bee18a2d7 Let them finally eat cake 2020-03-03 15:57:10 -05:00