Commit Graph

46253 Commits

Author SHA1 Message Date
Caiggas 433eaee639 fixes broken jumpboots
Removes hop_end and integrates it under the true return of throw_at. Removes the callback altogether as it is no longer needed

This is to fix the jumpboot bug caused by hop_end being run before the if statement is evaluated.
2019-03-06 08:57:17 -05:00
Kamparauta 8789c1d7e3 Changes the PAI loudnessBooster to a piano_synth, allows choosing of instrument. (#42910) 2019-03-01 13:50:16 +01:00
ShizCalev 05f2ac7317 Cleans up (mostly) defunt crit_fail var (#42908) 2019-03-01 13:45:30 +01:00
ShizCalev f643036911 Merge pull request #42946 from TerraGS/floorbot-update
Adds floorbot variations
2019-02-28 22:14:29 -05:00
ShizCalev 66fd697db4 Fixes 10mm rifle mags and sniper rounds not reporting ammo/updating material values. (#42938) 2019-02-28 11:46:23 -05:00
tralezab 7762e72405 New trait: Unstable (#42904)
* nice.

*  They exist to cease.

*  "They've got eyes inside my head!"

* frick

* unstable insanity

* Just try taking this bull by the horns. (eyeballs)

* It's a thankless job, and you'll probably die in an explosion. But the pay is pretty good.

* "The best denials are simply that: a beginning and end unchanged, a dream with no memory."

* fixes the dme
2019-02-28 10:35:13 -05:00
ShizCalev 988a098b51 Merge pull request #42935 from tralezab/patch-41
Fixes obsessed not losing their antagonist when their trauma was cured and obsessed antag hud
2019-02-27 23:11:36 -05:00
ShizCalev 328d066525 Merge pull request #42936 from Tlaltecuhtli/patch-7
the robotics assembly crate now actually has bot parts
2019-02-27 21:27:57 -05:00
ShizCalev 2b6ef96bac Merge pull request #42939 from MASMC/cult-shields
Fix shattering on cult shields
2019-02-27 21:27:34 -05:00
ShizCalev 089b383fc1 Merge pull request #42927 from Militaires/Militaires-patch-2
Fixes Arnold Pizza having a slight flavor of pineapple
2019-02-27 21:27:10 -05:00
ShizCalev 6b10ce7199 pizza pizza (#42920)
* pizza pizza

* pick
2019-02-27 22:19:44 +01:00
Tlaltecuhtli 36ed050fea uplink items rebalance (#42883)
* uplink items rebalance

* e
2019-02-27 15:53:52 -05:00
TerraGS c5932d73d8 removes uses of src 2019-02-27 14:31:11 -06:00
MrDoomBringer 62df21ace8 Update code/modules/cargo/packs.dm
Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2019-02-27 09:26:33 +01:00
TerraGS 9ccdcd0c11 Adds floorbot variations 2019-02-27 01:33:56 -06:00
ShizCalev 338d55b9bc Fixes syndicate mob block chance (#42912) 2019-02-26 21:40:04 -05:00
WJohn 6f959e7192 Slightly tweaks syndie lavaland/listening post bases. (#42913)
When the circuit lab was added and subsequently removed from the lavaland base, it left a poorly lit spot by medbay. Also adds explosive warnings in the test chamber to hopefully dissuade people from blowing the whole base up.
2019-02-26 21:39:51 -05:00
Tlaltecuhtli 4895473b6c the robotics assembly crate now actually has bot parts
🆑
add: the robotics assembly crate now actually has parts for 2 of each friendly bots
/🆑
dumb crate reworked into a good one
2019-02-26 18:55:43 +01:00
tralezab 86a6ead838 My summoning begins your debt, reviewer. 2019-02-26 09:03:36 -08:00
oranges c9d2b8c5f8 Logging tweaks and fixes (#42817)
* Add a virus log, plus a log for facehuggers

Logs each infect event and contains detailed descriptions of the virus

I also added a log message for printing virus culture bottles including
who printed them

Finally i tacked on a change to adding a game log entry for facehuggers
because why not

* Further logging fixes and updates

Medbots now combat log

combat log no longer tries to run keyname on an object because that
doesn't make much sense

* Dead say no longer logs twice

* tabs to spaces
2019-02-26 21:13:36 +11:00
Strommer Kilian 34cebb22e0 Adds firebots to the robotics arsenal (#42881)
* initial firebot commit

* add sprites for the firebot

* firebot.dm: More work on the firebot, implemented emag behaviour and better extinguishing
construction.dm: Added firebot assembly

* extinguisher.dm: Added support for the firebot assembly

* fix build error

* commit missing dme

* now drops the helmet again, also added a message for knocking people over

* fix previous commit, thats what you get for pushing without building first

* firebot now deploys firefighting foam when under heat instead of spraying wildly

* fix typos, move defines to top of file and adds undefines to the end

* renamed loc to drop_location for clarity

* fix drop location for real this time

* extinguisher.dm: Add newline to eof
firebot.dm: Make explode() use drop_location properly (for real this time), text fixes, removed improper use of .loc

* Update code/modules/mob/living/simple_animal/bot/firebot.dm

Co-Authored-By: Lett1 <kilian2311@gmail.com>

* update emag behaviour to use cfl3

* recipes.dm: Add crafting recipe for firebot
extinguisher.dm + construction.dm: Move extinguisher on_attack code to construction.dm
2019-02-26 21:01:42 +11:00
Time-Green 2f5a9ad416 Adds more genetic meltdown effects (#42864)
* makes genetic meltdown a little more interesting

* uses SLIME toxin and maybe melting your skin doesnt kill

* adds more genemelt effects

* removes accidental snail

* fixes .dme

* dir to dirextion and splits the spawn into a seperate proc
2019-02-26 20:53:30 +11:00
Jordie 5dc5e59431 Merge pull request #42898 from ShizCalev/jaunt-squeek-fix
Fixes jaunting mobs squeeking things.
2019-02-26 20:46:11 +11:00
Jordie a3f557ebc6 Merge pull request #42901 from optimumtact/regexshit
Hypnosis code improvements
2019-02-26 20:45:14 +11:00
Jordie 2756cfe648 Merge pull request #42902 from optimumtact/wizardtits
Wizard no longer runtimes on check_finish
2019-02-26 20:40:04 +11:00
Jordie d693323b8e Merge pull request #42906 from BuffEngineering/massdriver-fix
Fixes mass driver timed launch
2019-02-26 20:39:00 +11:00
Militaires 3c64a40ff6 Fixes Arnold Pizza having a slight flavor of pineapple
if you want something crazy like pineapple i KILL YOU
2019-02-26 11:24:35 +02:00
gy1ta23 ff24922fb9 Update cigs_lighters.dm (#42900) 2019-02-26 01:18:21 -05:00
Menshin a62dccb68d * Removed unusued variables (#42891)
* Generators now stop processing when they need
2019-02-26 01:16:54 -05:00
YPOQ 721178a3be Fixes defective clones not losing cloning pod traits (#42914) 2019-02-26 01:06:56 -05:00
MacHac 30ea56e6fd No more cheating at CTF (#42917) 2019-02-26 01:05:59 -05:00
YPOQ 12e51baf39 Fixes syndicate mob block chance 2019-02-25 15:16:55 -07:00
MacHac 203cac22ff Bank cards can now talk again. (#42849)
* recursive_loc_check now returns the appropriate atom.

* Added a preference to disable bank card chatting.

* Converted spaces to tabs, collapsed conditionals

* Update code/modules/economy/account.dm

Co-Authored-By: MacHac <piheads@gmail.com>

* Added the pref to the game prefs screen.
2019-02-25 15:07:34 -05:00
Mickyan 3318719b7b drunkfixes (#42890) 2019-02-25 13:27:07 -05:00
SouDescolado 0875b9df67 [READY][TESTED]Plasmeme Gulag (#42859)
* Plasmeme Gulag

* Remove extra check, add to list

* oops
2019-02-25 13:16:26 -05:00
ShizCalev 3d9b5c84e6 Damn I wish I knew how to read
Co-Authored-By: BuffEngineering <38743739+BuffEngineering@users.noreply.github.com>
2019-02-25 10:14:22 -05:00
ShizCalev c4c5ece3ba Fixes jaunting mobs squeaking things. 2019-02-25 09:31:28 -05:00
MacHac 846e89b199 Pumps, scrubbers, and canisters destroyed by explosions now release their contents. (#42809)
* Pumps, scrubbers, and canisters destroyed by explosions now release air.

* Made requested changes.

* Whoops

Co-Authored-By: MacHac <piheads@gmail.com>
2019-02-25 22:21:34 +11:00
Jordie d8b69235d8 Merge pull request #42791 from Mickyan/honkmeariver
Ends the Great Clown Shoes Debate of 2019
2019-02-25 22:19:45 +11:00
Gear c6e106e2b5 Update cult_items.dm
Testing this.
2019-02-25 06:17:45 -05:00
Rob Bailey 86cb5c2576 Fixes the RPG, renames it and adds some fluff text (#42853)
* fixes rocket launcher, but not some other issues with it

* oh god oh fuck I broke everything

* ok nevermind we rollin

* remove a dumb testing runtime

* less weird gramma on new description

* change the typepath of the rocket to make it easier to know what it is

* I don't remember if I even changed anything here but here it is anyways

* grammar error fix

* better qdel

* casing to fix the article system

* grammar fixes + hack to clear the mag

* small hack for single round mags and makes sure icons update after being loaded

* whoops

* minimize diffs

* capitalization with improper flag
2019-02-25 21:48:11 +11:00
Jordie 7c4e0f34a4 Merge pull request #42854 from 4dplanner/hiero
Standardises hierophant cardinal damage
2019-02-25 21:43:29 +11:00
Jordie f19e6ee4d4 Merge pull request #42888 from actioninja/foampistolfix
Fixes some sprite issues with the foamforce pistol
2019-02-25 21:39:21 +11:00
Tlaltecuhtli a0d7404391 adds shortcuts to some pipes (#42863)
* test

* w

* should work

* ghost fix

* oof

* e
2019-02-25 21:18:58 +11:00
Jordie 49292a20e9 Merge pull request #42861 from tgstation/MrStonedOne-patch-1
Bans now only default to banning ip if a permaban.
2019-02-25 21:15:01 +11:00
Name 82e92080b8 Fixes it but for real 2019-02-25 04:22:53 -05:00
Name e4ce5f4f85 Fixes it 2019-02-25 03:50:29 -05:00
oranges fca3d16576 Hypnosis code improvements
Hypnosis no longer runtimes forever if it can't generate a valid regex
from the user phrase

Hypnosis also no longer constantly regenerates the regex and instead
just matches using the existing regex
2019-02-25 05:31:44 +00:00
oranges 7b8ad385c3 Wizard no longer runtimes on check_finish
BYOND was evaluating the or last, so ignoring the !player.mind
2019-02-25 05:20:40 +00:00
ShizCalev a43c4acabc Fixes some minor speech replacement stuff (#42783)
cl ShizCalev
fix: Corrected slime mutation not correctly replacing the word douchebag.
fix: Fixed Elvis speech mutation inserting the word "getting" when saying "muh valids"
/cl
2019-02-25 15:01:28 +13:00