Commit Graph

27374 Commits

Author SHA1 Message Date
Vile Beggar c98d9d054b Properly adds a drill sergeant hat to the warden's locker (#42533)
* does the thing - please work

* adds it to the locker

* remove var/datum

Co-Authored-By: VileBeggar <edmir995@gmail.com>

* Update code/modules/clothing/head/jobs.dm

adds space

Co-Authored-By: VileBeggar <edmir995@gmail.com>

* adds denton's review suggestion

it's a webedit but i tested it and it worked

* makes it a bit less annoying

* grammar fix
2019-01-28 03:10:57 -05:00
kevinz000 5d4143f923 Emergency projectile fix #42544
Okay, oranges was right and I'm stupid.
Stops the server from crashing from a beam rifle, jesus.
2019-01-28 20:22:32 +13:00
leon2550 23fc38af7e Increase drop chance for Crusher trophies (#42481)
it takes way too long to get a crusher trophy as is, and it kinda makes crushers pointless. so i increased the drop chance to about 1 in 4 instead of 1 in 20. also, first PR, yay.
2019-01-27 21:10:10 -05:00
wesoda25 604a059eaf Mime Foods/Drinks Now Silence the Mime (#42499)
Mime stuff silences the mime now
cl
tweak: The nothing, silencer, and blank paper beverages now apply a mute on the mime for their duration (and a bit after).
cl

If you want to heal as a mime, you should not be allowed to speak. By extension things such as mime burgers will have this effect given the fact that they have nothing inside them (the reagent).
2019-01-28 09:11:21 +13:00
Kyle Spier-Swenson fbcb1b924f [s]Advance proc call no longer allows you to call world/datum procs as global procs (#42529)
* [s]Advance proc call no longer allows you to call world/datum procs as static procs

* Update debug.dm
2019-01-26 15:22:43 -05:00
4dplanner 1fb33ec33d Removes the mute aspect of perfluorodecalin (#42501)
cl
balance: perfluorodecalin no longer mutes
balance: it also heals brute and burn 3x faster (a new rate of 0.25 of each a second)
balance: it also causes toxin buildup over time
/cl
2019-01-26 12:22:21 +13:00
fluffe9911 d78bb9152b Adds the golem Time-Green was too communistic to add (#42475)
* capitalism is the true way

* better sound clip

* there we go

* fixes mine and time-greens copy pasta

* adds the soviet golem to the human file

* capatalist golems now bleed money

* makes it so both capatlist and soviet golems can now use guns

* hec

* makes the song the U.S.A Anthem to please the copyright gods and removes money bleeding cause im to lazy to do a refactor right now

* Update code/modules/mob/living/carbon/human/species_types/golems.dm

Co-Authored-By: fluffe9911 <dablank02@hotmail.com>

* re

* better sound clip
2019-01-25 15:38:07 -05:00
4dplanner 87ba21090c Megafauna cannot teleport (#42479)
Megafauna cannot teleport
2019-01-25 10:17:54 -05:00
as334 3e3fc41182 [READY]Atmos: Things Other Than Bombs Edition (#42194)
Due to the difficulty of interacting with the more complicated atmos content, the only things that toxin scientists and atmospheric technicians tend to focus on is bombs. The goal here is to give them some more productive things to do that encourage them to branch out beyond Tritium production and bomb rushing. Singlecaps, single tank bombs made with oxygen and tritium are also a recent balance concern that this hopefully addresses by adding a thermal energy requirement, which hopefully should make singlecaps either impossible or at least more difficult to construct, but leave normal bombs more or less intact. Also adds some ways for other gases in the mix to influence the BZ production reaction.

I'm looking for feedback on the specific number for values for how many points reactions give. I did my best to figure out some reasonable amounts via math, but I don't know that much about how techwebs are balanced.

cl as334
add: Tritium now needs to be an environment with a sizable thermal mass for full efficiency combustion.
add: Advanced Gas reactions now produce research points.
add: A gas canister with Pluoxium, Noblium, Stimulum, Miasma or BZ inside now produces points when sold via cargo.
/cl
2019-01-25 14:58:59 +13:00
YoYoBatty a3015ac893 Bodypart received damage is run through armor check in certain situations (#42462)
* Refactors the way bodypart damage is applied

* Update bodyparts.dm

* Update damage_procs.dm

* Update damage_procs.dm

* Update damage_procs.dm

* Update damage_procs.dm

* Update bodyparts.dm

* Update damage_procs.dm

* Update carbon.dm

* Update twohanded.dm

* Update damage_procs.dm
2019-01-24 16:11:52 -05:00
Razharas b8550d57ee [Ready] Added animations to cryo/sleepers opening/closing (#42289)
* Added animations to cryo/sleepers opening/closing

Also changed a bit of internal handling of icons of cryo
Images -> mutable appearances
No more updating icons every click on anything in the ui

* Back to images

* Actually fixes images

* Use of flick and animation sprites

Changed the way animations are done to use flick proc instead of animate
proc
Changed the way animations of cryo cells are organazed in a dmi, now
separate icon_state for opening and closing

* Support for resprites of the cryo subtypes

Support for resprites of the cryo subtypes
2019-01-24 14:47:10 -05:00
Kierany9 8113154a22 The PR that fixed Assimilation (#42156)
lots of commits
2019-01-24 12:14:08 -05:00
PKPenguin321 90b5da0355 Fixes ling notes copying on absorb (#42471)
* fixes ling notes copying

* addresses review
2019-01-25 03:33:53 +11:00
Erik 517128a53f Adds a proper TRAIT_RADIMMUNE check to the portable scanner and cloner. (#42489)
* ok

hi

* Add TRAIT_RADIMMUNE check to the portable gene scanner and to cloning

* Add TRAIT_RADIMMUNE check to the portable gene scanner and to cloning

* Implemented Suggestions.

* "No Sir, im not a synth, check my DNA!"

* You got it Boss

* Remove a useless Return

Co-Authored-By: Gousaid67 <gousaid67@gmail.com>

* Add a comment, also rerun checks
2019-01-25 03:33:16 +11:00
Time-Green 5621143421 Gibbing transfers reagents to meat (#42492)
* adds reagent from mob to meat

* actually makes reagents transfer on gibbing

* Apply suggestions from code review

Co-Authored-By: Time-Green <timkoster1@hotmail.com>
2019-01-25 02:50:56 +11:00
Jordie ad19c17660 Merge pull request #42490 from tgstation/Cyberboss-patch-1
Removes copypasta from synth code
2019-01-25 02:42:57 +11:00
81Denton 21fd1b2cea Ports wheelchairs from Hippiestation (#42401)
* Ports wheelchairs from Hippiestation

* Apply suggestions from code review

Thanks Cyberboss!

Co-Authored-By: 81Denton <32391752+81Denton@users.noreply.github.com>

* Removes unneccessary vars+attackby(), uses obj_destruction()

* Uses overlay SS and moved()

* removes redundant else, GetComponent(), moves has_buckled_mobs() to Destroy(), etc.

* Apply suggestions from code review

Co-Authored-By: 81Denton <32391752+81Denton@users.noreply.github.com>

* Removes unneeded has_buckled_mobs()
2019-01-24 09:25:23 -05:00
Time-Green 9861efde71 Cryokinesis and Geladikinesis mutations (#42453)
* Adds cryokinesis and renames the cold resistence file to space adaptation

* adds cryokinesis

* fixes icon conflict

is there actually a proper way to fix them thats not copying master and reimplimenting your own sprites?

* fixes a typo and lowers instability of cryokines by 5

* Apply suggestions from code review

Co-Authored-By: Time-Green <timkoster1@hotmail.com>

* maybe reverts line ending?

* unfucks flags?

* probably unfucks line endings

i swear to fucking god why does it even do this. i never even touched the file and reverting it to master doesnt do anything. fuck you git
2019-01-23 15:20:56 -05:00
Jordan Brown fe474bc0ab Merge pull request #42478 from WarJenkins/gasbag-no-smell
Plasmamen don't have to shower anymore
2019-01-23 12:23:15 -05:00
Dangerous dingidy doo 4df7d82680 Trash bounty (#42467)
* Tresh

* yes the janitors need more then 1 piece of trash.

* a

a

* b

b

* that's why travis got triggered

* Maybye like this?

* minor spelling error of centcom

* Fixed it hopefully now.

* done my man ExcessiveUseOfCobblestone
2019-01-23 12:23:07 -05:00
Jordan Brown fd3f3636eb Removes copypasta from synth code 2019-01-23 09:01:43 -05:00
Menshin 9dabcbbb04 Fixes for projectiles bugs (#42463)
* Bandaid fixes for bugs with reflectors projectiles and plasma cutters

* * Fixed bouncing piercing projectiles on qdel
* Fixed projectiles reflection not working
* Fixed heavy beam pulses not penetrating
* Changed numerous projectiles procs to use the new BULLET_ACT_* format

* Final conversions to new BULLET_ACT_* format
2019-01-23 21:00:11 +13:00
Vile Beggar 421ed22471 cl Vile Beggar
tweak: Plasmamen have no need for regular showering anymore.
/cl

why: there's no reason for plasmamen to be semlly, they're just skeletons after all, are they not?
2019-01-22 18:55:46 +01:00
4dplanner ea4234cd81 legion cores remove CC instead of adminhealing [READY] (#42378)
* legion cores remove CC

* legion -> regenerative

* lore

* Icons

fixes last reference to legion core in status

* Automatic creation of classes is possibly the worst feature of all time

* Moves remove_CC

* Review changes
2019-01-22 11:57:53 -05:00
Jordan Brown e101482887 Merge pull request #42470 from AutomaticFrenzy/patch/paper-airplane
Fix turning one paper into two paper airplanes
2019-01-22 10:11:29 -05:00
Tlaltecuhtli 010d61da04 [ready]rcd upgrades (#42388)
* rcdstuff

* e
2019-01-22 22:32:22 +11:00
tralezab b7c5559146 [READY] fixes roles that shouldn't be creepy being creepy and the jealousy objective asking you to assassinate the obsession + missed sanity (#42389)
* adds station positions global list

* She don't believe in shootin' stars But she believe in shoes and cars Wood floors in the new apartment Couture from the store's department

* missed comma

* embarassing

* Update code/modules/antagonists/creep/creep.dm

Co-Authored-By: tralezab <40974010+tralezab@users.noreply.github.com>

* parentheses

* shiver me timbers

* Hey, great work Mac! Now let's take down the next circuit!

* a plethora of fixes
2019-01-22 22:15:02 +11:00
PKPenguin321 a918476cf4 Two new electric powers for genetics (#42437)
* two new electric powers to genetics
Insulated - innate insuls
Shock Touch - Electric punch!

* fixed shock touch mutation and buffed it
also made it use electrocute_act() instead of flat burn damage, much nicer now
also added some vars to touch spells to let you set the draw/drop messages

* better internal logic
electrocute_act already checks for SHOCK_IMMUNE, so i dont need to do it
2019-01-22 22:06:29 +11:00
Time-Green b245f1ed5a Adds the golem Qustinnus was REALLY too afraid to add (#42402)
Stalinium is currently unavailable, so it's an admin only golem
cl Time-Green
rscadd: Adds glorious soviet Russia golem
/cl
2019-01-22 15:30:46 +13:00
Dax Dupont 01841b73a2 Makes the vent clog event happen more often (#42456)
* Makes the vent clog event happen more often

* qq
2019-01-21 16:57:38 -05:00
Jordan Brown f9a765b36d Merge pull request #42458 from Menshin/alternate_appearance_overlays
Adds a "transfer overlays" option to alternate appearances
2019-01-21 16:56:48 -05:00
Jordan Brown a347eac472 Merge pull request #42445 from PKPenguin321/ling-absorb-memories-fix
Fixes lings not getting some last words on absorb
2019-01-21 16:55:04 -05:00
Tad Hardesty ef510a8efa Fix turning one paper into two paper airplanes 2019-01-21 13:40:59 -08:00
PKPenguin321 0b9589855f break after finding LOG_SAY 2019-01-21 12:21:48 -08:00
Jordan Brown bac8b2e9a8 Merge pull request #42444 from Kierany9/patch-4
Capitalizes Pax's reagent name
2019-01-21 13:17:52 -05:00
Jordan Brown 9f9566a62f Merge pull request #42461 from anconfuzedrock/hahasteamedhamshahakillme
Makes the steamed hams meme event rarer
2019-01-21 13:14:33 -05:00
Jordan Brown 329fd1083e Merge pull request #42451 from 81Denton/gdi
Fixes unavailable syndicate bundle
2019-01-21 09:31:45 -05:00
Jordan Brown 62d00acbb7 Merge pull request #42457 from tgstation/MrStonedOne-patch-1
Partial revert of `Minor refactors` (#26305) by @Cyberboss
2019-01-20 18:41:27 -05:00
Dangerous dingidy doo dd383a07c5 Bone golems rattle and speak like skeletons do (#42436)
All skeletons no matter what must rattle together to unify against their
non-skeleton oppressors.
2019-01-20 14:32:06 -08:00
anconfuzedrock a5ea74541b doesn't remove the event like I should've 2019-01-20 13:58:30 -05:00
Menshin 5127c72ea3 * Added an option to transfer (and update) source overlays on an alternate appearance image
* Fixed a missing Alien Queen action icon (switch size)
2019-01-20 18:37:08 +01:00
Kyle Spier-Swenson 53b07ce8ef Update login.dm 2019-01-20 08:32:16 -08:00
Kyle Spier-Swenson 0d85b8b4c6 Partial revert of Minor refactors (#26305) by @Cyberboss
Partial revert of `Minor refactors` (#26305) by @Cyberboss
2019-01-20 08:29:11 -08:00
Denton eedc94f718 Fixes unavailable syndicate bundle 2019-01-20 09:35:48 +01:00
PKPenguin321 83d7360309 Fixes lings not getting some last words on absorb 2019-01-19 17:30:38 -08:00
Kierany9 2991ce761c capital 2019-01-20 01:58:23 +01:00
AdamElTablawy ca95afe4c1 fixes chilling infinite timestop (#42432)
cl no
fix: Chilling Sepia extracts cannot be used infinitely and will be consumed upon use.
/cl

[why]:

Chilling sepia extracts, unlike all other crossbred chilling extracts, were not consumed after activation with plasma and thus could be spammed constantly if you injected them with plasma and then activated them, with absolutely no delay or cooldown in any form.

This is probably a bug, given that cerulean extracts, the ACTUAL infinite use extracts, have a delay on how many times you can activate them in a quick timespan and will stop working if you activate it within the cooldown, and that the description text itself describes the extract shattering.

Even if it wasn't a bug, infinite timestop with no cooldown and superior to the actual infinite extract is bad and needs to go.
2019-01-20 10:50:16 +13:00
py01 c2e6506700 Fix values in blood beam failure message (#42423)
When casting a blood rite without enough charge, the chat message gives incorrect
numbers for the amount needed. This PR fixes that.
2019-01-19 13:06:07 -08:00
Qustinnus 06171c1a79 Fix hygiene runtimes, lighten sprite (#42404)
Hygiene sprite is a bit more transparent.
2019-01-18 14:22:09 -08:00
kevinz000 7370de6961 Fixes projectiles not hitting people resting, a bit of refactoring of how projectile target collision is done (#42241)
* Fixes projectiles not hitting mobs, some refactoring too

* some stuff for projectile can hit target to work with not being ontop of an object

* Yeah let's just refactor bullet_act while we're at it.

* Yeah let's just refactor bullet_act while we're at it.

* Yeah let's just refactor bullet_act while we're at it.

* CanPass returns true to projectiles regardless of hit

* snakecase?
2019-01-19 11:17:42 +13:00