Commit Graph

27303 Commits

Author SHA1 Message Date
Qustinnus e1d360ff05 [ready] Golem DLC pass 2018 (Adds new golem types) (#41951)
* Bronze golem

* adds creation

ad

* removes shit adds shit

* temp

* fff

* bone, leather and cardboard

* fff

* boneyard

* temp

* ahahahha dumb moron

* adds durathread golem sprites

* reee

* ass

* Auto stash before merge of "golemgang" and "origin/golemgang"

* fix

* uuh

* d

doned

* remove dupe
2019-01-16 13:42:20 -05:00
bgobandit ed3f3af978 Moves valentines/candyheart messages to json; adds new text (#42358)
* Moves valentines/candyheart messages to json; adds new text

* commas are my passion i love commas more than anything in the world give my valentine to commas and then FUCKING KILL COMMAS HOLY FUCK GOD

* commas.

* EVEN MORE VALENTINES

* I can't stop
2019-01-16 14:56:03 +13:00
coiax dd22f63ca8 Fix communication disorder plus mutadone causing chat spam (#42340) 2019-01-15 17:18:22 -08:00
bgobandit aeb603cb40 Clicking the health doll lets you examine yourself for injuries (#42357) 2019-01-15 17:12:29 -05:00
duckay 9cf3c5bbf8 Assistant Traitor Item: Part Electric Boogatwo (#42297)
* toolbox pls

* rstar

* Update uplink_items.dm

* contents, force

* i

* toolbox now costs 2 tc

robuster

* "toolbox"

* grammar mistake

* bust < bash

* description is better

A old, blue toolbox, it looks robust.

* changed bash skulls to bust heads

because i just watched the space station 13 video again

* yuh

* asdf

* throw!

* uplink now notes that it increases in damage
2019-01-15 12:13:36 -05:00
bgobandit 4466609c9e Resisting out of bucklecuffs takes an amount of time dependent on cuffs used. (#42344)
* Resisting out of bucklecuffing will now take different amounts of time based on the cuffs used.

* removes stray reference to "one minute"

* makes cobby's change
2019-01-15 12:11:32 -05:00
Jordan Brown bf880ffde2 Merge pull request #42298 from coiax/spot-the-satchel
Fixes smuggler's satchels not being visible with t-ray
2019-01-15 09:27:08 -05:00
coiax d8f84ca966 Desc/iconifies various pills, admin floorpill bottles (#42229)
* Renames aranesp, desc/iconifies various pills, admin floorpill bottles

* Unrenames
2019-01-14 17:32:40 -05:00
81Denton 35ebc44fab Rearranges uplink items (#42339)
* Rearranges uplink items

* arranges TC order
2019-01-14 17:23:01 -05:00
Jack Edge dd7dfb9594 2->1 2019-01-14 20:39:47 +00:00
coiax a7db6d6c82 Item fortification scroll changes (#42173)
* Item fortification scroll changes

* Code review
2019-01-14 12:29:05 -05:00
Jordan Brown 1a5d15348c Merge pull request #42335 from coiax/remove-metal
Gives admins a button to remove metal + cult dagger from Cultists
2019-01-14 10:34:34 -05:00
Jordan Brown 2b3b3ef80e Merge pull request #42329 from zxaber/Malf_doomsday_clamping
Fixes Malf AIs spawing multiple doomsdays
2019-01-14 10:33:42 -05:00
Jordan Brown a9ecf5955a Adds more holiday stuff. (#42348) 2019-01-14 10:02:12 -05:00
carshalash 312a49dfc0 Alcohol value tweaking (#42349)
* Update alcohol_reagents.dm

* Update alcohol_reagents.dm
2019-01-14 10:01:59 -05:00
Dax Dupont b1c8a8c982 Fixes supermatter extraction again (#42326)
* WHAT THE FUCK YOU FUCKING MORON

* includes parts of dent

* let's talk about floyd with his dumb ass prs, who the fuck asks for or wanted hygiene except fart fetish lovers, seriously musk/body odor is one of the weirdest and shit fetishes there are why are we enabling floyd's fetishes my god man the maintainers are a disappointment jesus christ.
2019-01-14 09:48:26 -05:00
oranges 8129713922 Merge pull request #42332 from Jordie0608/nowyoucanalsopretendyourebanningabstractart
Banning panel change and two fixes
2019-01-14 14:48:00 +13:00
bgobandit 40cd1fafab Adds more holiday stuff. 2019-01-13 02:17:40 -05:00
Time-Green 6295991056 fixes mutations instantly activating on species change 2019-01-12 18:24:05 +01:00
Jack Edge e6991a0bd2 Gives admins a button to remove metal + cult dagger from Cultists
🆑 coiax
admin: Admins have a button to remove the runed metal and cult dagger
from cultists.
/🆑

Could have used this in a previous round.
2019-01-12 17:06:14 +00:00
Jordie0608 20d2bbd8bc new ban group for appearance, emote and ooc, fix javascript error and role bans dcing client 2019-01-12 19:14:29 +11:00
Jordie 9b1e965e1e Merge pull request #42306 from coiax/beer-googles-buff
The signature barman booze sliding is now granted by their beer goggles
2019-01-12 17:55:08 +11:00
Jordie 443aec87b2 Merge pull request #42302 from coiax/random-items-into-spawners
Changes the type pathing of some "random" items
2019-01-12 17:46:16 +11:00
zxaber aed25b289e adds a check for doomsday being active 2019-01-11 16:46:58 -08:00
Suicidalpickles 289f242be7 Adjusts vehicles to new movement delay (#42273)
* changes secway movespeed

title

* adds other vehicles
2019-01-12 12:05:13 +13:00
oranges 8aa9a2a64a Merge pull request #42312 from Qustinnus/quickfix
initial hygiene tweaks
2019-01-12 10:41:44 +13:00
Qustinnus 31c19654e0 reworks emote sound code & adds screaming (Which only works if the code forces it. *scream wont make a sound) (#42216)
* done

* adds moth scream

* Update code/datums/emotes.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/datums/emotes.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/datums/emotes.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/datums/emotes.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* 1

* fixed

* fixed

* wew
2019-01-11 13:43:03 -05:00
Jordan Brown 2a30d24ac0 Merge pull request #42307 from hazamaitsuru/fix-grant-full-access
Fixes Syndicate access from Grant Full Access verb
2019-01-11 13:38:50 -05:00
coiax 73df5f541d Fixed slaughter demon exit speed boost (#42236)
🆑 coiax
fix: Fixed slaughter demons not getting a speed boost when exiting a
pool of blood. Fixed slaughter demon giblets not being visible.
/🆑

- Also switches some spawn() to timers, and got rid of a var on
slaughter demon previously tracking speed boosting.
2019-01-11 18:15:12 +13:00
Whoneedspacee c913364e54 [READY] Ash Drake bug fixes and edits (#42251)
cl Joe Berry
add: Mass fire attack, sends fire out from the ash drake in all directions
add: Adds an enraged attack for ash drake, heals him as well as making him glow and go faster, spawning massive amounts of fire in all directions
del: Removes the old triple swoop with lava pools attack
tweak: Lava pools can now spawn with the normal fire breath attack sometimes
tweak: Lava pools now have changed delays for lesser amounts so they don't all just place around one area
tweak: Increases default swoop delay for #41178
balance: Teleporting out of the lava arena now has some actual consequences by enraging the ash drake
fix: Makes lava arena a bit less laggy by not recalculating range_turfs every time
fix: Fixes #41887 though this will not change the turfs to basalt temporarily to prevent moving through indestructible walls
fix: Fire lines would not spawn if their range would place their final turf location outside of the map
fix: The arena attack will no longer destroy indestructible open turfs
/cl

[why]: Just some bug fixes and prevents some cheese weirdness when people teleport out of the lava arena. The lava arena attack would continue going even when there was nobody in the arena. Also increasing the delays on the swoop attacks makes it feel less like it's chaining attacks like lava arena over and over. The triple swoop with lava pools was tedious as best and I think this attack is more massively threatening for a second phase attack.
2019-01-11 18:14:08 +13:00
coiax 23c663c448 Wearing freshly washed clothes makes you feel better (#42129)
* Wearing freshly washed clothes makes you feel better

🆑 coiax
add: Wearing a jumpsuit that's been washed in a washing machine
will give you a positive moodlet.
/🆑

In addition, cleaned up the washing machine code so there no longer
needs to be a "has_corgi" var.

* Laundry is only clean for 5 minutes
2019-01-11 18:05:03 +13:00
Unknown 145ac716cb done 2019-01-10 22:45:21 +01:00
hazamaitsuru db6294ea42 Fixes Syndicate access from Grant Full Access verb 2019-01-10 14:38:37 -05:00
Jack Edge 7e49d1d022 The signature barman booze sliding is now granted by their beer goggles
🆑 coiax
tweak: Bartenders now gain their ability to "booze slide" from their
beer googles, rather than from a granter book in their backpacks.
/🆑

Less action button clutter, the ability to disable it if required (at
the cost of style), still keeping it possible for non-roundstart bartenders
(provided of course, you have the shades for it), as well as a less
janky way of checking than just looking through someone's action
buttons.
2019-01-10 19:23:28 +00:00
Jordan Brown 8964783c7c Merge pull request #42169 from optimumtact/speciesgenesfail
Code no longer runtimes on species change for mobs
2019-01-10 13:39:29 -05:00
Jack Edge 6945a367c3 Changes the type pathing of some "random" items
🆑 coiax
code: Randomly coloured gloves and randomly coloured glowsticks now have
slightly different typepaths, but otherwise function the same.
/🆑

Essentially, these items just acted AS spawners by qdeling in Initialize
(or at least hinting) and spawning a new totally seperate item.

There is nothing that uses the auto-equipping of random gloves, so I
removed it.
2019-01-09 22:50:52 +00:00
oranges 5b792193b8 Code no longer runtimes on species change for mobs
on species change was removing the inert mutation (from the mutation
index and mutation list) before trying to find it in that same list and
checking the index.

Instead we get the index first and then remove it
2019-01-09 21:49:06 +00:00
wesoda25 a3fb736e89 Lowers Nuka Cola Speed by 25% & Increases Soda Premium Drink Costs (#42271)
* Slows Down Nuka Cola a Little

* replaces nuka cola in vending machines

* adds fernet cola to drinkingglass

* removes speed change

* slows down nuka cola again

* Update drinkingglass.dm

* Update cola.dm

* bumps premium drink prices up $5
2019-01-09 16:13:53 -05:00
MrDoomBringer ccd618d877 Fixes certain situations where people in supplypods would sent to nullspace (#42087)
* reeling it in

* Revert "reeling it in"

This reverts commit 2b795a8baf5eec89fdc1e6b6a6ef9d36276c2e62.

* ya dun know

* huhuhuh tiny fan

* Tweak tangentially related formatting

* Update code/modules/cargo/centcom_podlauncher.dm

Co-Authored-By: MrDoomBringer <emmanuelssr@gmail.com>
2019-01-09 14:05:51 -05:00
Jordan Brown cd4b123a3a Removes html from medibot emergency declaration (#42266) 2019-01-09 14:02:43 -05:00
coiax 00b53b276a Improves quality of flavoured cigarettes (#42181)
* Improves quality of flavoured cigarettes

* Menthol cigs taste equally of smoke and mint while still buffing
2019-01-09 14:00:54 -05:00
Kierany9 131f348682 Added a sprite for Telekinetic Field (#42279)
* :(

* ye

* okay we done?
2019-01-09 11:07:30 -05:00
Jordan Brown d37f093cd4 Merge pull request #42277 from coiax/dead-dont-sweat
Dead people do not suffer hygiene problems, as they are busy decomposing
2019-01-09 11:06:01 -05:00
Jordan Brown eb0a5498a1 Merge pull request #42286 from nicbn/lix-he-lr
Fixes broken he pipes icons
2019-01-09 11:05:47 -05:00
nicbn 1632770299 Readds another one 2019-01-09 00:58:01 -02:00
nicbn 51f2b985a8 Readds a comment 2019-01-09 00:57:47 -02:00
nicbn 6c211ee7a1 Fixes weird heat exchanger pipes 2019-01-09 00:56:06 -02:00
Jordan Brown 5da26c6821 Merge pull request #42149 from FrostyFridge/selfsurgery
Allows mechanical organ manipulation to be performed on your own augmented body parts
2019-01-08 16:12:31 -05:00
Jordan Brown c561d51374 Merge pull request #42268 from recurracy/botany-squashonslip
Slippery skin makes Hypodermic prickles and Liquid contents trigger
2019-01-08 15:24:56 -05:00
Jordan Brown 484b3633f9 Merge pull request #42265 from coiax/podpeople-are-self-cleaning
Podpeople are always clean
2019-01-08 15:23:37 -05:00