Commit Graph
76 Commits
Author SHA1 Message Date
SharkmareandGitHub a74b124ccc Adding booze maker to booze bot 2019-08-21 11:14:50 +02:00
SharkmareandGitHub 19ebba8c1d Duplicate tray fix, added water and tongue.
Slurp slurp slurp slurp slurp slurp slurp slurp SLURP SLURP SLURP SLURP *SLURP* *SLURP* *SLURP* *SLURP* *SLURP* **SLURP** **SLURP**
2019-08-21 02:15:43 +02:00
SharkmareandGitHub 7042150682 ADDING BEAKER 2019-08-20 07:19:50 +02:00
SharkmareandGitHub b9fa50254e Slight BoozeBorg Fix
Was calling Parent proc at start and end
2019-08-20 05:39:05 +02:00
kcin2001andGitHub 8b61932c0b Merge branch 'master' into Booze-Borg 2019-08-16 23:02:05 -07:00
kcin2001 477e0772a9 Finished Booze borg - belly does nothing special 2019-08-16 22:49:37 -07:00
Lee Paplauskas 9ba5afe271 Merge remote-tracking branch 'origin/chef-borg' into chef-borg 2019-07-11 22:04:03 +01:00
Lee Paplauskas a3ec9e9d96 Service Dogborg Module "Chef-borg"
Added a new module, and skin. Based on Service Module Cyborg, but with added Dogborg modules.
Brigbelly is currently a placeholder - going to be working on a "Gourmet Gut", basically a microwave belly.
Added Vale's "Boozebot" sprites as alternate skin.
2019-07-11 20:42:55 +01:00
Lee Paplauskas 5fdebfe95f Service Dogborg Module "Chef-borg"
Added a new module, and skin. Based on Service Module Cyborg, but with added Dogborg modules.
Brigbelly is currently a placeholder - going to be working on a "Gourmet Gut", basically a microwave belly.
2019-07-11 19:39:35 +01:00
MovlerandGitHub ccde1d5f61 Rollerbeds and Droppers for the poor medihounds
Allowing medihounds to use industrial dropper to aid in chemistry making and giving them a rollerbed rack to let them use rollerbeds
2019-06-11 00:03:40 +02:00
SharkmareandGitHub 40918d18a9 Update station.dm 2019-03-06 21:19:50 +01:00
SharkmareandGitHub 469baf0dcd Making dogs rideable
I remember this was requested at some point.

Finally found the file that sets up all this stuff for the doggos, enjoy.
2019-03-05 15:37:55 +01:00
SharkmareandGitHub 9f4da67cc8 Update station.dm 2019-03-04 15:39:30 +01:00
ValekinandGitHub d553cdd419 Update station_vr.dm 2019-01-09 03:52:21 +02:00
IgnusVam b0734d5aa1 Big update
- Fixes spiders (I hope?) - Spiders now spawn in groups of 2-8, growing up should be fixed as well.
- Christmas-ifies all the maps
- Minor tweaks all around the stations
- Cleans up the map for central (a lot)
- Adds a new mob to the spawn list in the mines
- Fixes some minor shadekin issues
- Fixes it so borgs/AI can't understand gutter
- Modifies the timing of the radiation storm
- Hopefully fixes the cargo request event. No more buggy gas mixtures.
- Adds a flamboyant crate
- A bunch of other stuff.
2018-11-29 12:35:52 -07:00
AnonymousHybiandGitHub a415979d3c Fixes compile error <3
Ya forgot a comma ya doof x3
2018-09-12 17:49:04 +01:00
ValekinandGitHub 7e626e605d Update station_vr.dm 2018-09-12 03:08:00 +03:00
Reddeyfish 635013f331 Merge branch 'virgoMaster' into virgoPull 2018-06-10 12:33:29 -07:00
Arokha Sieyes 309a28911a Makes dogborgs spawn with bellies again
Fixes #3787
2018-05-28 21:02:58 -04:00
Arokha Sieyes 2d89d63c09 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/l3closet.dm
#	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	maps/southern_cross/structures/closets/misc.dm
#	maps/submaps/surface_submaps/wilderness/DoomP.dmm
#	vorestation.dme
2018-05-27 19:26:12 -04:00
Mechoid a4d7699c0f Fix Engi Synths 2018-05-24 22:08:52 -07:00
ValekinandGitHub 66e0d04a54 Medibork changes
This will change the load out for mediborks. 
It will add:

****Medical Gripper. Allows borgs to pick up beakers and open bottles. As well as pick up phoron crystals for grinding. This will allow them to create phoron based chems and setup cryo byond (heh) just turning them on. It also allows them to pick up pills and force them on patients such as carbon pills. It also allows picking up blood packs and placing them in IV's.
Full list of items are that can be picked up are:
 /obj/item/weapon/reagent_containers/glass,
		/obj/item/weapon/storage/pill_bottle,
		/obj/item/weapon/reagent_containers/pill,
		/obj/item/weapon/reagent_containers/blood,
                /obj/item/stack/material/phoron

****Traumakits, Advance Burn kits, and Splints.

Items work just as the normal ones. The only twist is that they got practically infinite ammo.  (1000 actually according to the code) 
However, Do not be fooled by the amount of charge it has when examining it.
But they may only apply it once per-limb so no heal spamming. Even after that limb takes damage again. You got to wait until the "already treated" thing wears off to reapply.

*Traumakits: The main use of the trauma kit is to stop external bleeding.
*Burn Pack: Main use of burnpack (ointment) Is to treat burn damage overtime. It seems useless next to the hypospray but who knows. It treats about 2.2 burn damage on use so it just might bring a burned victim's damage down enough to be defibbed.
*Splints: Lets you treat a patient with bone damage as best you can while waiting for a surgeon to show up. Of course won't actually fix anything, but at least they'll stop falling down in pain or dealing self damage by moving with broken bones.
2018-05-15 23:18:16 +03:00
Verkister 1a6441cbcb Squashed commit of the following:
commit 0422337a1ff4a96f27566727fb613f4a9ee993b1
Merge: bebd37667f 54d3e6d049
Author: Verkister <superverkelian@hotmail.com>
Date:   Tue May 15 12:22:42 2018 +0300

    Merge branch 'engibork' of https://github.com/Verkister/VOREStation into engibork

commit bebd37667fa38890590b46f45e9dc6bd76f13c56
Author: Verkister <superverkelian@hotmail.com>
Date:   Tue May 15 12:07:45 2018 +0300

    Engie borgo + Recycling update + Wet Dogborgs update
    -I really hope this squash merge attempt didn't go catastrophically wrong.

commit 54d3e6d049aee607daf7b356b4f5c2f7862ea9d9
Merge: af7807b238 36b6015aeb
Author: Verkister <superverkelian@hotmail.com>
Date:   Mon May 14 12:39:53 2018 +0300

    Merge branch 'master' into engibork

commit af7807b2386a3a3f222a012ecec2db2914bf3340
Author: Verkister <superverkelian@hotmail.com>
Date:   Tue May 8 13:19:22 2018 +0300

    Adds verb to refill borg extinguisher with water reserves.
    -Also makes human prey gurgled in sleeperbellies also give water according to their weight and size multiplier.

commit 700cbadfad4f13e976d8da5e5ac19c4381b84d4b
Author: Verkister <superverkelian@hotmail.com>
Date:   Mon Apr 30 16:13:43 2018 +0300

    The Wet Dogborg Update
    -Dogborgs now come with water reserve. (1000u, starts empty)
    -The water reserve is used by the tongue actions and floor scrubbing, which now require water.
    -Tongue actions spend 5 units each, and the scrubbing uses one unit per tile.
    -Yes, the licks also require water now. Slobbery.
    -The floor scrubbing can now be toggled on and off to preserve water.
    -The scrubber switch is a sprited module of its own for handy onscreen access when active.
    -The water reserves can be refilled by gurgling any reagents with sleeperbellies, and by using the tongue to lap up water from sinks and toilets lol.
    -Added a double check to analyzer belly to prevent it gaining levels from protected items.

commit 6872579dd9a91304dd0c00f6b0d78689bac63242
Author: Verkister <superverkelian@hotmail.com>
Date:   Thu Apr 19 18:25:59 2018 +0300

    oop

commit e50eba11034f14883a89c4a1031c344fca0c3b40
Author: Verkister <superverkelian@hotmail.com>
Date:   Thu Apr 19 18:19:30 2018 +0300

    Adds yet another new dogborg and other tweaks.
    -New engie oriented borgo comes with basic construction tools and stuff, no rcd or other fanciness.
    -Sheet synthesisers on this borg come with some extra capacity with the drawback of significantly slower charger replenish.
    -This comes to the other thing, which is the belly.
    -New borgo has a "matter decompiler" feature, which means it can recycle stuff to fill the material reserves. This thing reycles materials with autolathe rates though, none of that op drone decompiler stuff.
    -Now also janihound gut has a recycling feature.
    -The recycling guts don't give the borg any charge for the recyclable items, but other stuff charges fine.
    -Dogborg light replacer now starts with only 10 lights, and recharging it on the go draws resources from the recycled material reserves. Also it no longer recharges in borg charger.
    -Janihound can now also stack and drop steel/glass sheets to get the stuff out of the reserves.

    Other fixes:
    -Fixes certain dogborg tools not getting their naughty features unlocked with scrambled upgrade.
    -Minor fixes and cleanups in borgo sleeper code.
    -etc.

commit 096504ca95b8a662e911a1e92c195fe69a624f93
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Apr 18 08:14:04 2018 +0300

    Adds engie bork
2018-05-15 12:39:52 +03:00
Aronai SieyesandGitHub 8081af1568 Merge pull request #3159 from Heroman3003/arachnophobia
Arachnoborg sprite set.
2018-03-16 21:32:31 -04:00
Leshana 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
CerebulonandAnewbe b7090d7df2 Adds Tajaran Akhani language. (#5032)
* Adds Tajaran Akhani language.
Fixes plural form of Tajaran (Tajara->Tajaran) in about 50 places.

* Gives the language a colour distinct from Siik.

* Changelog
2018-03-11 16:55:08 -05:00
Verkister 8cffc2298c Readies our borg stuff for next sync fixes.
-Fixes the default module icon missing from our _vr.dmi
-Makes our custom modules enable ui_style_vr to pull the hud icon from our dmi instead.
-Makes relogging etc not revert to default ui file if ui_style_vr is enabled for the borg.
-Moves the clumsy VS edit borg reset stuff to a more appropriate place.
-Adds the recently fixed attack anim offset fix and the ui_style_vr to the reset module.
2018-03-07 11:29:46 +02:00
Aronai SieyesandGitHub de44e7e01e Merge pull request #3185 from Verkister/voreday
A whole bunch of vore related fixes.
2018-03-06 13:08:43 -05:00
Verkister 6e816a3517 A whole bunch of vore related fixes.
-Fixes prey not hearing gurgles from inside the gut.
-Prey now gets it privately in full glory.
-Tweaked the miniscule vore sound falloff that made things barely audible at all. People not in the immediately adjacent tiles may hear some faint noises if they listen intently enough, but that feels like a less of a problem compared to the stuff being barely hearable on ground zero tile.
-Fixes hunger noises.
-Hunger noises now scale gradually from 0 to 100% vol in the span of 250 to 0 nutrition.
-Fixes attack anims messing up pixel offsets on our big voremobs and dogborgs.
-Removes prey size multiplier from mob vore "fullness" that would prevent 1-seater mobs from touching any even slightly taller than average chars. They already have a max size blocker in the will_eat thing.
-Makes bellies hide prey deathmessages again.
-Fixes security oties not changing to hold mode for human arrests.(I swear I had fixed this thing before???)
2018-03-05 14:38:55 +02:00
Heroman3003 d7945aaabd added spiderborg sprites 2018-03-01 09:41:16 +10:00
Verkister 9eeb4f0f65 Small wide/dog borg tweaks/fixes
-Adds a new var to specify nonstandard borg sprite sizes. No longer dogborg exclusive.
-Makes the dogborg var usable for standard sizes as well (for the special features like rest poses and gun/gut overlays)
-Makes the borg reset module reset the forementioned vars.
-Excludes wideborg from the standard size polaris/vore vr_sprite_check to avoid unintended default file reverts.
2018-02-28 10:42:40 +02:00
Aronai SieyesandGitHub 2935ec1ac8 Merge pull request #3149 from VOREStation/aro-sync
Polaris Sync
2018-02-27 21:48:52 -05:00
Arokha SieyesandLeshana 3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml
2018-02-27 21:27:35 -05:00
elgeonmbandAnewbe 8c9c99f817 Adds new languages (#4961)
* langs

* humanity first

* humanity first but for real this time

* i know how to spell good

* grumbles
2018-02-26 21:21:50 -06:00
Heroman3003 55121258bc Fixed some funky code. 2018-02-27 07:59:33 +10:00
Heroman3003 d077d0239c Added mining, security and standard Handies (for full set) 2018-02-26 14:33:12 +10:00
Heroman3003 970dc7fd3c Added new Handy sprites and possibility for new ones 2018-02-26 05:25:23 +10:00
Leshana ef3df27528 VOREStation Specific Merge Changes
* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
2018-02-17 16:56:31 -05:00
Leshana 7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
2018-02-17 00:35:29 -05:00
MechoidandAnewbe 251297a2ba Promethean Balancing, Lore-compliant Modification of Security Equipment (#4722)
* Works on Balancing Prometheans

* Reorganize from Master Merge

* Tries to fix that gun conflict that the DMI merger apparently did fine?
2018-02-08 14:58:17 -06:00
mistyLuminescenceandAnewbe 4e4ba35444 Surgeon/Research/Medimerc borg fixes. (#4751)
* Surgeon borg fixes.

* Merc combat medic borgs too.

* No med stacks

* chembags

* no chem bags (sorry, I tried!)
2018-02-08 14:44:41 -06:00
Arokha Sieyes 043608d807 POLARIS: Remove the need for borgs to have HUD items in their module inventory 2018-01-17 19:34:56 -05:00
Arokha SieyesandLeshana ff228754b3 Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Arokha SieyesandGitHub 0df3060a3e Merge pull request #2762 from Verkister/squashbelly
Fixes science borg analyzer belly and couple other things. (*squish edition)
2018-01-16 23:47:17 -05:00
VerkisterandGitHub 1899adef2c Removes redundant baton charging from sec borg.
The baton uses the borg's own cell.
2018-01-16 13:47:27 +02:00
Verkister f15b01a8e1 Squashed commit of the following:
commit 95d6df8b82416bfb8a4b5ec742f211664be5e082
Merge: c004b9aae0 9a56c27c9f
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Jan 14 09:11:42 2018 +0200

    Merge branch 'master' of https://github.com/VOREStation/VOREStation into nerdbelly

    # Conflicts:
    #	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm

commit c004b9aae077a98a405fa6bf770c4622a4be85c6
Author: Verkister <superverkelian@hotmail.com>
Date:   Thu Jan 11 08:55:34 2018 +0200

    Update dog_sleeper_vr.dm

commit ce6d51e353e9c0d70f4a3dcdf228e2714b1a373f
Author: Verkister <superverkelian@hotmail.com>
Date:   Thu Jan 11 08:29:59 2018 +0200

    Update dog_sleeper_vr.dm

commit d0f368dc5a5b628c5df753f7e969027733de0f6f
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 18:35:08 2018 +0200

    Update dog_sleeper_vr.dm

commit c97e426c8774390f2d82c52813faf1f2245a636b
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 18:24:00 2018 +0200

    Tested fixed

commit 7de1d5bcb704583f5dec062df757e9a4e9269732
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 18:05:55 2018 +0200

    whooBs

commit 889fd4454266731ed7c816e997ddc5e3f98d8210
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 18:03:56 2018 +0200

    Update dog_sleeper_vr.dm

commit ccbd9513fb6ea841fb79e048364cac6c8143c621
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 18:02:15 2018 +0200

    Update dog_sleeper_vr.dm

commit 8651bf40fc844b332741aa4224f15c6fdc28e1dc
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 17:54:20 2018 +0200

    Sync button only shows up when appropriate

commit 5030c0326ddfe7635866b68bd3b9d102d2e2a1f2
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 17:27:49 2018 +0200

    no large items into analyzer noms

commit ad8c437fff5e193f9a2229fcc024969199ac2a7a
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 17:18:17 2018 +0200

    Update dog_sleeper_vr.dm

commit 18dc5fdc1b025719f0cd802573c4872f35fa1045
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 17:13:26 2018 +0200

    Update dog_sleeper_vr.dm

commit 4f21d4597f768c471f8031232c17eb696ce1d956
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 17:08:00 2018 +0200

    Update dog_sleeper_vr.dm

commit 9f19e1ac117b0d434e6f2a03f0a8fcb38ca296bb
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 13:10:57 2018 +0200

    scan after nom

commit c82ba8078fddb9ee4c99a0ee6b65ec68f0ad9ba8
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 12:59:42 2018 +0200

    Update dog_sleeper_vr.dm

commit 2670ec54b78186892ac6fcdb55e6613ee7a5dcc7
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jan 10 12:32:41 2018 +0200

    Fixes science borg analyzer belly and couple other things.
    -Digestive Analyzer belly now works as intended.
    -It now tells the item's research value on nom and updates internal files on gurgles. Sync button is in the sleeper UI for the belly.
    -Fixed UI refreshing on all borg sleeper bellies.
    -Updated the entire sleeper code to use to_chat.
2018-01-16 10:50:16 +02:00
Arokha Sieyes d3d1ed971e VS: Remove the HUD items from dogborgs 2018-01-15 13:30:56 -05:00
Arokha Sieyes 58720bfe4d POLARIS: Remove the need for borgs to have HUD items in their module inventory 2018-01-15 13:30:37 -05:00
NeertiandGitHub 20062a5fd2 Merge pull request #4528 from Atermonera/int_gps
Adds gps units to borgs
2018-01-14 11:53:09 -05:00
Arokha SieyesandGitHub 149b582f66 Merge pull request #2727 from Suhayll/master
Add New Dogborg model for Sec
2018-01-14 00:17:08 -05:00