2308c70a8f
SYNC: Alter promethean changes
2018-05-25 15:05:39 -04:00
088eee3d96
SYNC: Compileability fixes
2018-05-25 13:29:30 -04:00
6b42df0685
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
...
# Conflicts:
# code/__defines/misc.dm
# code/controllers/master_controller.dm
# code/game/machinery/computer3/computers/card.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/stacks/medical.dm
# code/game/objects/structures/signs.dm
# code/modules/admin/admin_verbs.dm
# code/modules/client/client defines.dm
# code/modules/client/client procs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/events/radiation_storm.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/living.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/mob.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_dispenser.dm
# config/example/config.txt
# html/changelogs/.all_changelog.yml
# interface/skin.dmf
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-05-25 13:23:47 -04:00
7e44e95d24
Corrects some plane and layer issues
2018-05-20 18:41:21 -05:00
bdfa34c911
SSAO object excludes
...
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:54:10 -04:00
91f0c05a4b
SSAO object excludes
...
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:38:22 -04:00
1dcb2e1a1b
Removed shadekin from Slime Vore reaction
2018-05-08 14:29:48 +10:00
2748ceb170
Merge pull request #5243 from Anewbe/sleeping_pills
...
Soporific and Chloral work when ingested again
2018-05-05 12:09:37 -07:00
70b23e905e
Merge pull request #5209 from VOREStation/pol-medsound
...
Ports the medical item sounds from Bay
2018-05-02 22:11:03 -05:00
2b9fb9398a
Soporific and Chloral work when ingested again
2018-05-02 17:35:26 -05:00
1e052007e0
Chemicals should process again
2018-05-02 13:09:29 -05:00
40ba73a7a4
Merge pull request #5231 from VOREStation/pol-vs-3604
...
Allow cancelling in chem master modals for pills
2018-05-01 12:39:42 -07:00
1db4c4b677
~Promethean Tweaks: The one with the chemicals, and the other thing. ( #5201 )
...
* Promethean Tweaks Round Howevermany We're On Now
* Tweak again. Drinks only plink damage that can be regenned. Multiple drinks, or other sources of tox will still mean these are dangerous.
* Add Blurb other than just "What has science done?"
* Adds the changelog.
* Fixes the stupid.
* Fixfix @ Ater
2018-05-01 12:23:47 -07:00
f0be908e39
Allow cancelling in chem master modals for pills
...
Suggested in https://github.com/VOREStation/VOREStation/issues/3604 , this adds cancel buttons when creating pills so you can abort the process rather than getting forced to create pills you might have just accidentally clicked the button for and then breaking them back into beakers.
Resolves https://github.com/VOREStation/VOREStation/issues/3604 (Just in case GitHub knows how to cross-repo close issues)
2018-04-30 11:42:09 -04:00
1849e1280e
Merge pull request #3577 from Screemonster/willitblend
...
Makes blenders multitoolable for grub larva
2018-04-28 20:49:19 -04:00
d4b800d263
does the thing more betterer
2018-04-28 21:02:34 +01:00
6f50bce4e7
Xenochimera refactoring
2018-04-27 20:04:59 -04:00
6cebb30a16
Makes blenders multitoolable for grub larva
2018-04-27 08:57:25 +01:00
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
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
2a4182cc8e
First effort fix of the slimes integration with taur riding.
2018-04-22 15:24:48 -04:00
dcbf8627ef
Fixed size-affecting reagents not working when ingested
2018-04-22 08:16:09 +10:00
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
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
6adbe5537e
Merge pull request #5079 from BillyBangles/they-arent-sharpies-i-swear
...
Adds permanent markers
2018-03-28 11:49:10 -07:00
9f4a14b171
POLARIS: Weird snacks runtime
2018-03-25 17:09:33 -04:00
e91bb8f3b6
Merge pull request #5071 from Cameron653/patch-1
...
Makes coffee milkshakes STOP KILLING PEOPLE
2018-03-22 22:31:13 -04:00
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
70ac478aea
Merge pull request #5065 from VOREStation/vs-port-3204
...
[PORT] Revamp logging for consistency
2018-03-20 21:13:47 -04:00
05fd53ebcc
adds permanent markers
...
also tweaks paint recipe to use ink instead of crayons.
2018-03-19 20:20:31 -04:00
5b55716779
Merge pull request #3269 from VOREStation/aro-runtimes
...
Fixes several runtimes
2018-03-18 01:41:32 -04:00
b5dda94cee
POLARIS?: Reduce chance of cophorizine limb breaks
2018-03-17 21:55:09 -04:00
00a4466dc3
VS: Sometimes you use syringes on other things
2018-03-17 21:44:13 -04:00
14bdc519e4
POLARIS: Weird snacks runtime
2018-03-17 21:24:11 -04:00
36097cb31d
Changes
2018-03-17 00:52:07 -04:00
b02773a71e
Merge pull request #3216 from Screemonster/hatchnow
...
Makes the monstertamer/clonexadone reaction force hatching too
2018-03-16 20:11:18 -04:00
981b768320
Makes a failsafe drink overdose proc
2018-03-16 13:35:20 -04:00
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
5212fa152b
Species names should now use defines
2018-03-15 20:24:45 -05:00
73838e0a62
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
f2fff2358b
Fix DEBUG: Runtime in syringes_vr.dm,17: Cannot execute null.Cut()
2018-03-11 16:56:16 -04:00
5749b3b2a7
Makes the monstertamer/clonexadone reaction force hatching too
2018-03-11 20:20:38 +00:00
2c9bdf3ae4
POLARIS: Revamp logging to be consistent
2018-03-10 17:18:09 -05:00
06eb3e5e47
Merge pull request #5018 from Anewbe/syringe
...
Syringe adjustments
2018-03-10 13:28:00 -08:00
f2da429eab
Merge pull request #4980 from MisterLayne/ED_CLN
...
Adds the ED-CLN
2018-03-10 15:04:07 -06:00
1df2ee7537
Merge pull request #3186 from VOREStation/aro-antibio
...
Remove Spaceacillin
2018-03-09 13:24:50 -05:00
45c91a5176
POLARIS: Spcllin code refactor, +new antibio
2018-03-09 13:11:24 -05:00
7ed36f51f2
Syringe adjustments
2018-03-07 18:46:50 -06:00
21c9cd0a05
fixes code, and adds changelog (hope I did it right)
2018-03-06 20:52:55 -05:00
2d452be603
Ingested reagents act half as quickly, rather than half as well
2018-03-05 19:40:29 -06:00
Arokha Sieyes