Commit Graph

1099 Commits

Author SHA1 Message Date
Kelshark
e1eae846f9 Merge branch 'master' of https://github.com/VOREStation/VOREStation 2017-04-18 19:29:23 -04:00
Kelshark
fb47e064d5 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	maps/RandomZLevels/labyrinth.dmm
2017-04-18 19:25:46 -04:00
Neerti
6bd0f8742e Finished coding makeshift armor. 2017-04-18 03:16:10 -04:00
Leshana
7a4dc4bf79 Merge remote-tracking branch 'polaris/master' into polaris-sync
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm
2017-04-15 23:14:32 -05:00
Kelshark
8ee9f436ea Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/dead/observer/say.dm
#	config/custom_items.txt
#	vorestation.dme
2017-04-13 19:43:56 -04:00
Leshana
e8af4afc88 Port tg/paradise/good soft-edge lighting
Ports https://github.com/ParadiseSS13/Paradise/pull/6161
Its merged in nearly verbatim as far as the lighting module goes.
Changes outside the lighting module are merged based on our codebase.
2017-04-12 19:11:45 -04:00
Arokha Sieyes
e7d8af7ae7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/mob/mob.dm
#	html/changelogs/.all_changelog.yml
2017-04-10 20:41:18 -04:00
Kelshark
4cec8849a2 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	config/custom_items.txt
#	icons/mob/widerobot_vr.dmi
2017-04-09 09:56:44 -04:00
Anewbe
6c169e7ad6 Adds in an Unathi-made jerky snack 2017-04-07 23:36:22 -05:00
Leshana
6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme
2017-04-01 19:19:42 -04:00
MagmaRam
33dffeb0b8 Merge pull request #2955 from Anewbe/heart_damage
Big Ol' Medical Tweaks
2017-03-28 20:02:24 -05:00
Arokha Sieyes
9edf3a6629 Polaris Merge Sync 2017-03-26 20:12:34 -04:00
Cerebulon
3c17d1b33f Added in-hand sprites to most item lacking them from the Medical department.
(Full list: Body bag, Advanced Mass Spectrometer, Rescue Suit Control Module, Stethoscope, Stasis bag, Defibrillator, Blood Packs, Advanced Trauma/Burn Kits, Hypospray, Biopsy Scanner, Surgical Drill, Fixovein, Retractor, Bone-Gel, Bone Setter, Cautery, Hemostat, Inflatable Wall Box.
2017-03-26 07:04:01 +01:00
Kelshark
139dbf132c Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/RandomZLevels/listeningpost.dmm
#	vorestation.dme
2017-03-26 00:20:03 -04:00
Arokha Sieyes
88b5756977 Arokha SA Rework (Polaris) 2017-03-22 19:32:19 -04:00
Anewbe
2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
Arokha Sieyes
9660186dfd Not So Simple Animals (#3103)
* Merge two not-really conflicts

Thanks git, that whitespace conflict was super important?

* DME merge

* Added defines for mobs used by simple animals.

* Lost a slime along the way

* Disable debug settings

* HONK!!!

* Remove redundant hostile decls

* Replace loc= with forceMove in old SA code

I guess I should think of the children.
2017-03-22 14:30:07 -05:00
Kelshark
ea669886d0 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/mob/language/station_vr.dm
#	code/modules/surgery/robotics.dm
#	config/custom_items.txt
2017-03-17 19:28:02 -04:00
Anewbe
5481e90cbe Merge pull request #3074 from VOREStation/recipes
"Recipe Dump" admin verb
2017-03-13 17:17:54 -05:00
Arokha Sieyes
bbd5603905 Math is hard okay 2017-03-13 18:01:11 -04:00
Arokha Sieyes
166e888397 Find/replace job for bread slices
`/obj/item/weapon/reagent_containers/food/snacks/breadslice` is not a real thing. The only reason the code compiled with references to it is because there was a line at the top of sandwich.dm that defined the attackby proc for it, which willed it into existence with all the default 'snack' values so it was just called 'snack', had no icon, etc.

`/obj/item/weapon/reagent_containers/food/snacks/slice/bread` is the real path for bread slices, and this replaces all mentions of one with the other.
2017-03-13 14:16:10 -04:00
Arokha Sieyes
e2c4064f49 VR-specific fixes for this 2017-03-13 14:15:04 -04:00
Arokha Sieyes
8f9bb4cdc3 Find/replace job for bread slices
`/obj/item/weapon/reagent_containers/food/snacks/breadslice` is not a real thing. The only reason the code compiled with references to it is because there was a line at the top of sandwich.dm that defined the attackby proc for it, which willed it into existence with all the default 'snack' values so it was just called 'snack', had no icon, etc.

`/obj/item/weapon/reagent_containers/food/snacks/slice/bread` is the real path for bread slices, and this replaces all mentions of one with the other.
2017-03-13 14:14:49 -04:00
Arokha Sieyes
01edd04bc5 Add several new foods
Sushi, Lasagne, Wings, Doner Kebab, Reishi's Cup, Hot&Sour Soup, General Tso's, Kitsune Udon, Goulash, Roast Beef

Also made it so synths don't have reduced taste. You can just RP it however you want, I'd rather let them see the info about flavor and if you want to RP that you have low quality taste 'sensors' then so be it.
2017-03-13 00:36:34 -04:00
Arokha Sieyes
4c0e330140 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync 2017-03-11 18:47:17 -05:00
Kelshark
25d81c8acf Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/admin/verbs/buildmode.dm
#	code/modules/multiz/movement.dm
#	code/modules/multiz/structures.dm
#	code/modules/multiz/turf.dm
#	config/custom_items.txt
#	vorestation.dme
2017-03-10 20:34:12 -05:00
Arokha Sieyes
1783dc282b Math is hard okay 2017-03-10 18:45:31 -05:00
Yoshax
3a31c88f43 Fixes sliceable food and slices 2017-03-10 19:49:15 +00:00
Yoshax
26d56e2cf4 Fixes/adds reagent transferring to/from food 2017-03-10 16:39:57 +00:00
Screemonster
87f940293a adds particle guns to science and cargo 2017-03-09 18:10:26 +00:00
Arokha Sieyes
5b13bcbb50 Merge pull request #1089 from Yoshax/ewwwfatpeople
Nutrition + Diet Changes
2017-03-04 18:35:07 -05:00
Arokha Sieyes
4f06a18057 Dragor fluff items, Aronai fluff item fixes
Also fixes *flip to not print an error message (emotes must have messages that they display) and redoes how vials start with reagents to make it easier to code them. Also swapping genders as a promethean won't randomize your hair anymore. That was silly, and relevant to Dragor's thing.
2017-03-04 16:04:43 -05:00
Arokha Sieyes
05719b68b4 Update pill.dm
Spell it out fam
2017-03-04 14:00:43 -05:00
Yoshax
f54ae4be13 Makes the diet pill more effective, and makes Lipozine more effective in general 2017-03-04 16:25:32 +00:00
Kelshark
081e280e27 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/global.dm
#	config/custom_items.txt
#	icons/mob/human_races/r_xenochimera.dmi
#	vorestation.dme
2017-03-03 19:17:04 -05:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Arokha Sieyes
2c493405bd More tweaks
Fix necrotic limb surgery
Make fever not so powerful that it resists cryotubes
All necrotic limbs produce toxins unless OD on spaceacillin, regardless of infection
Fix dropper use during surgery
Fix 'gap' in printable adv scanner infection reports
Fix nanoui template for adv scanner
Add examine text to gangrene and highly infected external limbs
Add flags to the MMI holder organs to make them robotic, and thus not infectable if they are > squishy MMI (posibrain, digital)
2017-02-28 01:13:29 -05:00
Yoshax
dad4e19785 Does custom food stuff 2017-02-19 01:02:12 +00:00
Kelshark
8df7fcd10a Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	.gitignore
#	vorestation.dme
2017-02-18 09:40:18 -05:00
Arokha Sieyes
e4557b0724 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-14 20:29:57 -05:00
Screemonster
ce28b35275 Adds Krak-B-Gone, a silicate spray for fixing windows 2017-02-14 18:29:55 +00:00
Kelshark
5b6c8aeab6 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/clothing/under/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/human_movement.dm
#	config/custom_items.txt
2017-02-12 00:32:26 -05:00
Anewbe
c1008b52cd Merge pull request #2989 from MagmaRam/sandwich
Meat Meat Meat Meat Meat Meat and Fork Sandwich
2017-02-09 21:24:03 -06:00
Arokha Sieyes
b2499073d3 Remove adrenaline from vendor syringe 2017-02-06 19:59:03 -05:00
MagmaRam
f92e189cc7 Fixes not being able to pick up sandwiches with a fork if they're at max size. 2017-02-05 19:25:59 -06:00
Yoshax
f497cbf5cf Droppers are known for being inconsistent and inaccurate 2017-02-05 01:41:50 +00:00
Kelshark
9ce88c8c6c Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
#	config/custom_items.txt
#	icons/obj/gun.dmi
#	maps/virgo-1.dmm
#	vorestation.dme
2017-02-03 21:35:22 -05:00
Arokha Sieyes
2e6d423047 Fix chocolate milk
I am a man who can appreciate his chocolate milk. Unless his chocolate milk carton is always full of normal milk due to a faulty constructor inheritance scheme that fills it with first the wrong amount of milk, then tries to fill it with more wrong milk, then finally attempts to fill the soggy milk carton with chocolate milk.
2017-02-02 15:34:34 -05:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Anewbe
1b3b67b8ca Merge branch 'master' into heart_damage 2017-01-30 22:43:09 -06:00