Commit Graph

16260 Commits

Author SHA1 Message Date
Repede
d97f049b1c Adds Strix Hades plushie as a selection, ingame plush. 2019-11-17 21:20:27 -05:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
Novacat
2ee3dcbb27 Merge pull request #6136 from Heroman3003/gateway-faux-fix
Switches to an alternative system for gateway map use.
2019-11-15 12:46:55 -05:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Heroman3003
62889c39d9 Removes deprecated code 2019-11-15 08:38:53 +10:00
Novacat
f60b2094a0 Merge pull request #6173 from Very-Soft/vendortime
New vending machines
2019-11-13 13:42:19 -05:00
Meghan-Rossi
f8c214ea67 Fix box of service keys being called "box of command keys" 2019-11-12 08:55:43 +00:00
Soft
7e1a5db6c8 New vending machines 2019-11-09 04:20:29 -05: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
80874ede4b Merge pull request #6155 from Very-Soft/no-bepis
Changes the cola machine sprite to something more generic and flashy
2019-11-07 02:12:28 -05:00
Atermonera
a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05: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
Soft
2a01058620 Changes the pepsi machine sprite to something more generic and flashy
Changes the soda machine sprite because pepsi is lame
2019-11-03 05:54:08 -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
52ea82ae2c Merge pull request #6506 from Heroman3003/mech-runtime-roundstart-fix
Switches equipped mechs to use initialize instead of new
2019-10-30 21:00:21 -04:00
Heroman3003
cfe37161cd Switches to a different system for gateway map use. 2019-10-30 10:54:27 +10: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
Novacat
45d9730737 Merge pull request #6134 from VOREStation/upstream-merge-6494
[MIRROR] Add Sounds to stuff! (Port from VOREStation)
2019-10-29 17:44:53 -04:00
Novacat
139d247be3 Update suit_storage_unit.dm 2019-10-29 17:33:52 -04:00
Rykka Stormheart
c177796c2d Add Sounds to stuff! (Port from VOREStation) 2019-10-29 17:32:08 -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
Novacat
59fa7c2899 Merge pull request #6125 from VOREStation/upstream-merge-6498
[MIRROR] Fixes cloning
2019-10-27 20:26:25 -04:00
Atermonera
ca9c62d062 Fixes cloning (#6498)
* DNA Records transfer descriptors and gender

* fixes cloning, because there's a whole nother console that touches the records
2019-10-27 17:25:40 -04:00
Atermonera
1b21bb3d15 Merge pull request #6497 from parasitoide/master
Compatable -> Compatible
2019-10-27 16:21:16 -04: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
29dd9facf0 Merge remote-tracking branch 'upstream/release' 2019-10-24 21:58:11 +01:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
Novacat
1a01a71296 Merge pull request #6065 from Rykka-Stormheart/shep-dev-sound-overhaul
Adds Sounds to stuff!
2019-10-24 15:57:18 -04:00
Unknown
d2da0e1f38 Fixes Doom Patrol 2019-10-24 15:18:29 -04:00
Unknown
1a0c3a83e6 Expedition Fixes
- Removes unnecessary stairs from Virgo 2's Surface
- Swaps many of Virgo 2's POI terrain to Virgo 2 subtype
- Shrinks Doom Patrol POI so that it actually can be picked
- Makes Doom Patrol more difficult, but also increases rewards
- Swaps water on Virgo 2's surface for lava
- Gives all new Virgo 2 POIs their own virgo 2 area so that base turf is set properly.
- Fixes base turf problems with Virgo 4's POIs
- Adds a new Syndicate Beacon subtype, it does not give you objectives.
- Removes spiders from Virgo 2 POIs, replaces with Virgo 2 spawners
- Virgo 2's mobs can actually survive in the atmosphere now
2019-10-24 13:52:22 -04: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
Novacat
485995583d Update medical_tools.dm 2019-10-21 20:00:57 -04:00
Novacat
2a9eaa9953 Merge pull request #6090 from VOREStation/upstream-merge-6478
[MIRROR] Shards only do damage if you hit things with them
2019-10-21 19:57:32 -04:00