Commit Graph

8353 Commits

Author SHA1 Message Date
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Meghan-Rossi
f8c214ea67 Fix box of service keys being called "box of command keys" 2019-11-12 08:55:43 +00:00
Novacat
af52f4e7c3 Merge pull request #6094 from Novacat/nova-pathfinder
Rarer events, more event variety
2019-11-08 13:32:45 -05:00
Hawk_v3
f976948ce3 Merge remote-tracking branch 'upstream/master' 2019-11-07 19:54:10 +00:00
Novacat
d3b07d3fb7 Merge pull request #6164 from VOREStation/upstream-merge-6501
[MIRROR] Sharpening kits.
2019-11-04 22:49:12 -05:00
lolman360
31995aba35 Sharpening kits. (#6501)
* one

* rtwo

* image

* Update material_weapons.dm
2019-11-04 21:44:30 -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
Verkister
91c8018a59 Merge branch 'master' into littlefunfixes 2019-11-01 20:52:20 +02:00
lolman360
ae859c49e9 [READY] Recolourable energy weapons. (#6507) 2019-11-01 12:38:06 -04:00
Verkister
ec71920801 More stuff.
-Gives the mob radio a much easier way of implementation. (Just take the item and boop the mob with it to do the entire setup. Booping a radio enabled mob with another will eject the mob's current radio without replacing it so you'll need to boop the emptied mob again to apply the new radio)
-Adds some additional stability to the borg sleeper clean cycle.
-Fixes unequipped sleeperbellies never ceasing to process and update, which had been causing runtime spam and such when undeploying an occupied sleeperbelly.
-Tweaks the gurgle gainz received from digested body parts.
-Earlyports a fix for unconscious borgs never dying.
2019-10-31 15:39:51 +02:00
Verkister
e28722b64d A bunch of little fixes and event features.
-Adds simplemob radio. A "headset" that can be used and listened on by simplemobs. Adminspawn the item, shove it into your mob's contents, and link a reference to the item into the mob's mob_radio var. Additional keys can be added same way as regular headsets before "implanting" into the mob.
-Adds leap/pounce verb for simplemobs. Essentially a copy of how the dogborg pounce works.
-Couple fixes to borg/animal pounces. (makes the pounce "animation" reset to default_y instead of hardcoded crap. Also disables spin on simplemobs when pouncing. Unfun maybe, but that var can always be toggled ingame to get the sick ninja moves)
-Adds adminbus switch to enable abuse mode on trasheater. (only skips the whitelist, blacklist still applies)
-Fixes a bunch of icon updates on the vorecode. Humanmobs no longer get forced canary runtiming mob icon updates, and the existing mob icon updates are no longer simplemob exclusive (and thus broken for pAIs and such)
-Earlyports a fix for mobs wandering off when grabbed.
-Earlyports a fix for adding verbs to mobs via varedit. (Was utterly broken for anything that wasn't STRICTLY a root type of human, robot, or AI. Also now works for simplemobs as well.)
2019-10-31 14:27:18 +02:00
Anewbe
d7c0195212 Merge pull request #6500 from KasparoVy/you_tracking_implanted_the_floor
Loadout Implants Properly go in Mob, not on Floor
2019-10-29 20:34:36 -04:00
Atermonera
b068af1c38 Merge pull request #6502 from parasitoide/gibs4
Stops referencing nonexistent gib4 sprite
2019-10-29 17:25:40 -04: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
c95a447b71 Merge remote-tracking branch 'upstream/master' 2019-10-27 17:58:34 +00:00
Cerebulon
6385a2f662 ERT Rangers Costumes (#6493)
* Sprites

* and code fuckit
2019-10-25 15:07:49 -04:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
Unknown
0e4c548375 Merge remote-tracking branch 'VOREStation/master' into nova-pathfinder 2019-10-23 20:20:02 -04:00
Novacat
0edea26637 Update radio.dm 2019-10-23 19:39:30 -04:00
Atermonera
02a8c8f8cf Cleans up radio code 2019-10-23 19:19:12 -04:00
Unknown
c6ab9affc7 Fixes broken announcements
Master branch issue.
2019-10-21 23:41:33 -04:00
Unknown
c6d8cc4a22 Rarer events, more event variety
- Reduces the chances of a mundane and moderate event firing by 50%
- Reduces the chances of a major event firing by 75%
- Re-adds most Polaris events. Notables include carp, spider infestations, rogue drones, vines, and meteors.
- Grubs upped to major event
- Station-spawned spiderlings can no longer grow up to be nurse spiders.
- Fixes and re-enables the Ian storm event
2019-10-21 22:53:59 -04:00
Novacat
173fd85764 Merge pull request #6086 from Verkister/werespecies
Adds werebeast event species
2019-10-21 21:02:53 -04:00
Novacat
54aeb32617 Merge pull request #6091 from Novacat/nova-ert
Uplink additions
2019-10-21 21:01:06 -04:00
Novacat
f70fffc474 Merge pull request #6082 from VOREStation/upstream-merge-6465
[MIRROR] Medical Expansion
2019-10-21 20:12:18 -04:00
Unknown
fb32846243 Merge remote-tracking branch 'VOREStation/master' into nova-ert 2019-10-21 20:06:45 -04:00
Novacat
382ef5573c Merge pull request #6085 from SolatK/master
Adds teshari plush
2019-10-21 20:03:23 -04:00
Unknown
7dd592aa05 Uplink additions
Adds a few tools and medicines to uplinks. Also includes some polaris-side radio tweaks since I forgot I had it on this branch.
2019-10-21 18:57:44 -04:00
Atermonera
524520cb8b Shards only do damage if you hit things with them (#6478) 2019-10-20 17:55:27 -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
SolatK
6ba2f072b8 Rya! 2019-10-20 15:23:56 +03:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
TrilbySpaceClone
2ce4802fde better icons 2019-10-19 15:13:06 -04:00
Repede
64ed1878cc Merge branch 'master' into larger_bodybags 2019-10-17 20:10:01 -04:00
Repede
e7a5341f2d Adds f13 (Mauser) brand cigarettes to game vending machines. 2019-10-17 19:09:57 -04:00
Trilbyspaceclone
50db981d28 Update bodybag.dm 2019-10-17 12:35:04 -04:00
TrilbySpaceClone
77b13577a1 grave storge 2019-10-16 21:18:18 -04:00
Unknown
f1bd34846b Properly fixes shadekin phase plummeting 2019-10-14 22:13:27 -04:00
Hawk_v3
2cc8800ede Merge remote-tracking branch 'upstream/master' 2019-10-08 15:14:36 +01:00
Unknown
dade2aa80b Conflict Resolution 2019-10-06 13:12:11 -04:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Hawk_v3
74cc210e21 Merge remote-tracking branch 'server/master' into map 2019-10-05 23:10:09 +01:00
Hawk_v3
6e801b1e8e Map Updates. 2019-10-04 01:52:44 +01:00
Hawk_v3
5e4a914604 WIki Link Standardisation
All the links should point to our wiki now. All that's left is for it to be filled out.
2019-10-03 22:21:37 +01:00
Unknown
39e9d1472e Adds Centcomm flag to CC Headsets 2019-10-01 21:29:19 -04:00
Unknown
3be682a30d Gives CC Access to Explorer comms 2019-10-01 20:58:05 -04:00
Hawk_v3
691a1239f4 Merge from Vorestation 2019-09-29 21:53:09 +01:00
Verkister
056799efe5 Makes stasis cages use the new sprites
Turns out they were never a storage structure subtype to even begin with.
2019-09-28 22:01:11 +03:00
Atermonera
6e4fc794d6 Merge pull request #6467 from Heroman3003/datum-timer-beam
Makes every single shot not create ~40 timers but 1
2019-09-27 16:07:25 -04:00