Hawk_v3
0f3c802427
Merge remote-tracking branch 'upstream/master'
2019-08-22 21:32:01 +01:00
Novacat and GitHub
2c4cd96be7
Merge pull request #5396 from KasparoVy/taur_hide_stuff
...
Allows Tails to Hide Bodyparts, Shoes & Clip Uniforms/Suits
2019-08-21 22:15:53 -04:00
Atermonera and VirgoBot
65b6dc762c
Merge pull request #6410 from Mechoid/PrometheanOrgans1
...
Promethean Organ Tweakening
2019-08-21 17:40:45 -04:00
KasparoVy
e762c191ea
Adds Ability for Tails to Hide Bodyparts
...
Adds a method for tails to hide bodyparts like legs to allow for a bit more spriter freedom. Sets Satyr legs & taur bodies to prevent regular legs from rendering when selected.
E.g.1 The Satyr legs & taur bodies prevent the regular leg organs from rendering, so you no longer have to sprite them such that they cover the pixels ordinary legs would've occupied.
E.g.2 The deer body has bulky front legs because if they weren't sprited to cover the regular body beneath you'd have wierd pixels poking out. This prevents that from happening by preventing legs from rendering when you got a taur tail.
2019-08-20 01:45:46 -04:00
DameonOwen
d1d42af439
One last change to the path
2019-08-17 08:35:20 -04:00
DameonOwen
e04724bdea
I'm tired, okay?
2019-08-16 23:12:51 -04:00
DameonOwen
5eedd046a3
Port limbs, wings from Aphrodite
2019-08-16 23:09:32 -04:00
Hawk_v3
0c85b3a4dd
Merge remote-tracking branch 'upstream/master'
2019-08-09 21:35:04 +01:00
Andrew and VirgoBot
e4deaa6478
Combat Mechs Can Punch More Things ( #6303 )
...
* Combat Mechs Can Punch More Things
Removes the var to check for the 5 things it can attack, instead it can punch anything (but not everything will take damage).
Gives punching objects a check so you don't accidently smash something without meaning to.
Gives closets and canisters a proc to take_damage so they'll actually get smashed by the mechs.
* Take_Damage Boogaloo
* More take_damage Stuff
Adds click delay on attacking barriers.
Proper noises when attacking material doors and barricades.
More stuff can be broken by mech punch and simple mobs.
* Adds changelong
* usr to user
2019-07-24 17:00:24 -04:00
Hawk_v3
bc7ea8379a
Merge remote-tracking branch 'upstream/master'
2019-07-02 17:54:29 +01:00
Atermonera and VirgoBot
9a994e4e16
Merge pull request #6226 from SubberTheFabulous/MonitorFix
...
Makes some alt. roboheads actually use their monitors
2019-06-24 15:24:23 -04:00
Hawk_v3
5ec6b3294e
Merge remote-tracking branch 'upstream/master'
2019-06-18 01:26:30 +01:00
Anewbe and VirgoBot
50ff14f8f8
Merge pull request #6079 from Mechoid/AugmentPreWork
...
Augment Work
2019-06-16 20:58:32 -04:00
Hawk_v3
c2d90f5c3f
Merge remote-tracking branch 'upstream/master'
2019-05-23 22:46:42 +01:00
mistyLuminescence and VirgoBot
42cc20278e
Big Bugfix Bonanza
2019-05-23 12:59:29 -04:00
Hawk_v3
50e2482613
Merge remote-tracking branch 'upstream/master'
2019-04-22 20:12:14 +01:00
Atermonera and VirgoBot
30726b47d6
Starts work on Organs affecting Reagent Processing
2019-04-18 13:09:48 -04:00
Hawk_v3
41f0bd9f6d
Merge remote-tracking branch 'upstream/master'
2019-04-14 19:44:13 +01:00
Heroman
22a5b2f436
Undoes some VOREStation promethean nerfs
2019-04-09 20:09:19 +10:00
Neerti and VirgoBot
fd4dc97a8b
Merge pull request #6048 from Heroman3003/promcore-decay-fix
...
Fixes promethean cores decaying pointlessly
2019-04-08 12:02:19 -04:00
Repede
e4dd365fe1
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/controllers/subsystems/mapping_vr.dm
# code/datums/datum.dm
# code/datums/datumvars.dm
# code/datums/supplypacks/voidsuits.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/defib.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/world.dm
# code/modules/client/preference_setup/loadout/loadout_accessories.dm
# code/modules/client/preference_setup/loadout/loadout_eyes.dm
# code/modules/client/preference_setup/loadout/loadout_head.dm
# code/modules/client/preference_setup/loadout/loadout_suit.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/food/food/snacks.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/reagents/Chemistry-Recipes.dm
# code/world.dm
# config/custom_items.txt
# config/example/config.txt
# config/example/game_options.txt
# icons/mob/robots.dmi
# icons/obj/mining.dmi
# maps/submaps/surface_submaps/wilderness/wilderness.dm
# vorestation.dme
2019-04-07 19:40:12 -04:00
Neerti and VirgoBot
f8c9664178
Explorer Update - Cataloguers
2019-03-30 16:19:24 -04:00
Novacat and GitHub
1415c6cd0a
Merge pull request #4843 from VOREStation/upstream-merge-5993
...
[MIRROR] Fixes the greatest bug to affect our time.
2019-03-28 22:00:55 -04:00
Novacat and GitHub
785a36d4e0
Merge pull request #4783 from VOREStation/upstream-merge-5942
...
[MIRROR] Headgibbing is a config thing
2019-03-28 21:27:19 -04:00
Novacat and GitHub
e5fdafd56e
Merge pull request #4781 from VOREStation/upstream-merge-5969
...
[MIRROR] Fixes Diona and Promethean prosthetics.
2019-03-28 20:46:05 -04:00
Neerti and Novacat
256fb03dcc
Merge pull request #5942 from Anewbe/headgibs
...
Headgibbing is a config thing
2019-03-28 20:38:34 -04:00
Novacat and GitHub
92a9d81599
Update robolimbs.dm
2019-03-28 20:33:14 -04:00
Novacat and GitHub
25c9780722
Merge branch 'master' into upstream-merge-5965
2019-03-28 20:31:48 -04:00
Mechoid and Novacat
c604e38036
Adds Alien Reality pods, aka AR pods, for use in events or PoIs.
2019-03-28 14:51:50 -04:00
Neerti and Novacat
fe0b7373b3
Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
2019-03-27 14:49:30 -04:00
Unknown
03dcb65c01
Fixes most of the issues
2019-03-27 00:38:44 -04:00
Neerti and Novacat
86174593bf
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
Unknown
976aec2f71
Sorts out this PR
2019-03-26 21:43:56 -04:00
Neerti and VirgoBot
765af99014
Merge pull request #5993 from Mechoid/Fix_A_Semicolon
...
Fixes the greatest bug to affect our time.
2019-03-08 20:19:01 -05:00
Spades and GitHub
6e2172a5ae
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
Neerti and VirgoBot
6211735bac
Fixes Diona and Promethean prosthetics.
2019-02-18 03:53:46 -05:00
Neerti and VirgoBot
b0f219766d
Fix Organs not removing their verbs properly.
2019-02-18 03:52:33 -05:00
kevinz000 and VirgoBot
fc178c1e04
Makes math helpers defines for performance
2018-12-06 16:15:00 -05:00
Atermonera and VirgoBot
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
Hawk_v3
30d6ee7801
Merge remote-tracking branch 'upstream/master' into updates
2018-11-01 23:15:58 +00:00
Andrei Jors
9fb6894a07
Brings this over from Citadel. Ignore the CITADEL CHANGE comments.
2018-10-25 17:16:05 -04:00
Hawk_v3
10ca5bb70f
Merge remote-tracking branch 'upstream/master'
2018-10-14 17:09:41 +01:00
Screemonster
5644ee00fd
forgot to mark edit
2018-10-10 22:17:20 +01:00
Screemonster
b34714684a
gives prommie cores an icon
2018-10-10 13:48:22 +01:00
Hawk_v3
beb7579ed3
Vore Updates and merges
2018-10-03 18:25:39 +01:00
Atermonera and VirgoBot
7b92808a20
Merge pull request #5621 from Anewbe/hemophilia
...
Fixes some bloodloss bugs
2018-10-02 03:11:29 -04:00
Spades and GitHub
d68b641d6b
Merge pull request #4287 from Verkister/smallvoreqol
...
Small qol tweaks for contamination and sleeperguts.
2018-10-01 09:29:08 -04:00
Spades and GitHub
b8f240f199
Merge pull request #4282 from VOREStation/sync-09272018
...
Polaris Sync 09-27-2018
2018-10-01 08:43:03 -04:00
Arokha Sieyes
e1245025b2
Fixes protean brain icons
...
Was supposed to have a special sprite
2018-09-29 19:43:59 -04:00
Verkister
7a148f2a9d
Small qol tweaks for contamination and sleeperguts.
...
-Removed the toxicity of gurgled items. (Planning to make them affect the user's examine flavor when equipped though.)
-Removed the silly animation on mess overlay. (possible remake later with extra flavors etc)
-Fixed sleeperbellies not suppressing injury emotes and deathmessages during digestion.
-Ruled out the possibility of the sleeperbellies breaking over defined "patient" going "missing".
2018-09-29 16:07:22 +03:00
Hawk_v3