Commit Graph

1169 Commits

Author SHA1 Message Date
Heroman
991ab37daf Progress 2019-11-11 06:04:55 +10:00
Hawk_v3
f976948ce3 Merge remote-tracking branch 'upstream/master' 2019-11-07 19:54:10 +00:00
Atermonera
a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Mechoid
e1fa847bc2 Xenowork Prep For Future (#6491)
* Xenowork, weeds walls and material blobs.

* More weeds

* XenoUpdoots

* Stop that, me.
2019-11-04 21:38:02 -05:00
Schnayy
d4e38581cc Adds new FBP brand + sprite. (#6513) 2019-11-03 13:34:52 -05:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
Novacat
5e7735a807 Update brain.dm 2019-10-22 21:14:26 -04:00
Unknown
6333e7ab72 Ports Polaris #6492
Fixes a divide by zero issue with brain damage and pulse.
2019-10-22 21:13:25 -04:00
Novacat
173fd85764 Merge pull request #6086 from Verkister/werespecies
Adds werebeast event species
2019-10-21 21:02:53 -04:00
Verkister
47d56f13d1 Adds werebeast event species
-Adds new customizable carbonspecies for werebeast shenanigans.
-Stats-wise somewhat faster, tougher, and hungrier compared to base humans. Also darksight.
-Added whatever the code needed to make it possible to have taller carbonspecies.
-As a side effect, the forementioned also makes it possible to do long necked species and more.
-The werebeast can use the tail, hair, ear, and markings customization. This will be messy on tails that rely heavily on human silhouette. The hair and ear customization is fully functional using unedited human assets with a coded offset.
-The hair/ears offset is a modifiable var for the species specific head organ subtype, and can be used by other species that use custom headtypes.
-The werebeast has a set of markings as well, restricted to the species. face, belly, socks, and nose.

Currently the werebeast ready clothing is limited to:
-Back: basic backpack, basic satchel, leather satchel, basic courier bag, and basic duffle.
-Belt: toolbelt and security belt.
-Eyes: most sunglasses and sunglass huds, welding goggles, regular and 3d glasses, plain, meson, and science goggles.
-Feet: black and brown basic shoes, galoshes, jackboots, and toeless jackboots.
-Hands: latex/white, nitrile, yellow/insulated, black, and fingerless gloves.
-Head: the entire selection of vanilla headgear.
-Suit: labcoat, regular and white hazard vest, and 4 flavors of varsity jackets.
-Uniform: white pants, white shorts, white, orange, yellow, black, grey, robo, engie, and janitor jumpsuits, swept and nurse skirt.
Everything else will likely not show up at all, but more can be added whenever needed.
2019-10-20 18:45:29 +03:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Hawk_v3
0f3c802427 Merge remote-tracking branch 'upstream/master' 2019-08-22 21:32:01 +01:00
Novacat
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
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
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
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
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
42cc20278e Big Bugfix Bonanza 2019-05-23 12:59:29 -04:00
Heroman
703c27da7e Refactors shadekin 2019-04-28 15:10:06 +10:00
Heroman
4a5512c864 hud, procs work 2019-04-27 11:20:35 +10:00
Hawk_v3
50e2482613 Merge remote-tracking branch 'upstream/master' 2019-04-22 20:12:14 +01:00
Atermonera
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
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
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Novacat
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
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
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
256fb03dcc Merge pull request #5942 from Anewbe/headgibs
Headgibbing is a config thing
2019-03-28 20:38:34 -04:00
Novacat
92a9d81599 Update robolimbs.dm 2019-03-28 20:33:14 -04:00
Novacat
25c9780722 Merge branch 'master' into upstream-merge-5965 2019-03-28 20:31:48 -04:00
Mechoid
c604e38036 Adds Alien Reality pods, aka AR pods, for use in events or PoIs. 2019-03-28 14:51:50 -04:00
Neerti
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
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
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
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Neerti
6211735bac Fixes Diona and Promethean prosthetics. 2019-02-18 03:53:46 -05:00