Commit Graph

7524 Commits

Author SHA1 Message Date
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
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
Kierany9
8113154a22 The PR that fixed Assimilation (#42156)
lots of commits
2019-01-24 12:14:08 -05:00
PKPenguin321
1ab0c127dc [Ready] Adds a new power, Transcendent Olfaction, to genetics (#42414)
* adds Transcendent Olfaction to genetics
codersprite by me

* fixes
made messages work, added a new message
removed duplicate icon

* uses disgust instead of oxy damage

* addresses review
mostly changing usr to user. global mob list -> global carbon list since that's what i parse for anyways.
also changed a message.

* makes it compile
2019-01-25 03:35:50 +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
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
Trilbyspaceclone
555f0bda23 Fixes power tool drill fitting in boots/wallet (#42476)
* Update wallets.dm

* Update pockets.dm

* Apply suggestions from code review

For when people forget how sister code works

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2019-01-23 14:32:04 -05:00
Tlaltecuhtli
010d61da04 [ready]rcd upgrades (#42388)
* rcdstuff

* e
2019-01-22 22:32:22 +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
Jordan Brown
70a4fbf858 Merge pull request #42460 from anconfuzedrock/matterofthecart
Makes compressed matter cartridges tiny
2019-01-21 13:14:50 -05:00
anconfuzedrock
a17b4ec96f compresses compressed matter 2019-01-20 13:45:46 -05:00
Tad Hardesty
5c6f0edce6 Fix mousetrap boxes having no illustration 2019-01-19 23:02:54 -08:00
oranges
18200016d9 Bibles no longer runtime when changing bible style (#42411)
The correct icon states are restored, meaning yoru bitching necronomicon
can look cool now
2019-01-19 06:47:37 -07: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
Jordie
529b287312 Merge pull request #42320 from 81Denton/dusted
[Ready] Improves various supermatter messages
2019-01-18 23:22:30 +11:00
coiax
881e8c1ab9 Refactors NODROP flag into TRAIT_NODROP (#42109)
* Refactors NODROP flag into TRAIT_NODROP

🆑 coiax
fix: Anti-drop implants can no longer be used to drop objects that they
were not responsible for sticking to a person's hand.
fix: Backfiring with a Barnyard spellbook will now play a spooky horse sound.
refactor: Refactors the way that "NODROP" items work to a new system,
there should be no change in functionality.
/🆑

Various items in the codebase were doing weird hoop jumps in order to
preserve the nodrop flag's state when it also wanted to change it, so I
moved it to a trait system.

I may have gone overboard with the type of unique trait sources, but
those can be changed later. My long term plan is make a general "CURSED"
nodrop origin, which means you can unlock cursed items by being hit with
a bolt of door opening or something. But that's for another PR, this has
no functionality changes, apart from some slightly modified descriptions
on cursed masks.

- Removed a bunch of redundant voice changing code for all the voice
changing animal masks, used two new clothing flags for this purpose.
- Also refactored a bit the animal masks, making new cursed subtypes that play
the sound when created.

* Drop location
2019-01-17 15:24:30 -05:00
Dax Dupont
4f9d04bc32 This is a family friendly codebase (#42385) 2019-01-17 11:35:23 -05:00
tralezab
0633947862 Fix grammar in time desynchronizer (#42372) 2019-01-16 20:41:47 -08:00
granpawalton
4c8d35cbbe allows proffesion belts to hold their appropriate holosign (#42376) 2019-01-16 17:08:07 -05:00
Mickyan
ca84639286 Allows coloring objects with spray cans (#42327) 2019-01-16 16:43:04 -05:00
Jordan Brown
2af87bcd0d Merge pull request #42354 from tortellinitony/cig_refactor
Cigarettes extinguishing and vapes refactor
2019-01-16 13:58:08 -05:00
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
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
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
Denton
87ae58ef08 Merge remote-tracking branch 'tgstation/master' into dusted
at least it's not a map merge conflict
2019-01-14 21:29:05 +01:00
tortellinitony
7863c4a393 Add extinguishing to cigarettes and lighters. Makes vapes use container flags. 2019-01-13 13:00:48 -05: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
Denton
ffc1c52e73 Improves various supermatter messages 2019-01-11 13:52:40 +01: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
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
Jack Edge
4a2433317c Fixes smuggler's satchels not being visible with t-ray
🆑 coiax
fix: Smuggler's satchels can now be found with t-ray scanners, as
intended.
/🆑

Fixes #42296.

I used a trait because currently this is the only object that I'm aware
of that uses partial invisibility (because it wants to be visible to
ghosts), and it seems a waste to dedicate an entire obj_flag to one
item, or put a hardcoded typepath.
2019-01-09 19:31:53 +00: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
Denton
a8e55f5ce4 Restricts magspear throw_range 2019-01-08 17:42:16 +01:00
coiax
ffd160a495 Readds non-persistent contraband filled smugglers satchels (#42228)
* Readds non-persistent contraband filled smugglers satchels

* Ten random satchels are placed each round
2019-01-07 21:16:47 +11:00
Militaires
37f6d2fa1d corrects Hippocrates bust description (#42244)
* corrects Hippocrates bust description

* cited >> referred to
2019-01-07 19:26:56 +13:00
81Denton
cd3d97c1a6 Reworks spearguns, adds Syndicate bundle, carp clothing adds carp faction (#42102)
* Reworks magspears, adds Syndicate bundle, carp clothing adds carp faction

* 20 magspears

* Replaces bandolier with quiver

* Slightly increases throwforce to OHKO space carps
2019-01-07 19:19:45 +13:00
coiax
074b2f942e Die of fate tweaks and fixes (#42073)
* Die of fate tweaks and fixes

🆑 coiax
fix: Rolling a 6 with a die of fate now reduces your speed as intended.
fix: Rolling an 8 with a die of fate will cause the explosion to be
around the roller, not the die.
tweak: Die of fate effects now make loud visible messages so it's
obvious what has happened.
admin: Dice can now be "totally rigged" with admin edits to
unconditionally always roll a certain value, rather than just some of
the time. A new "cursed die of fate" has been added to demonstrate this
effect.
/🆑

- new proc `do_smoke` that does basic smoke effects, to avoid the same
pattern for making smoke effects.
- Dice rigging has been split into two vars, "rigged" for the severity
of the rigging (not rigged, basically rigged, totally rigged), and
rigged_value for the value it's trying to rig to.

* Stealth die of fates

* Code review II?
2019-01-07 19:17:45 +13:00
oranges
e7393d7d2d Merge pull request #42205 from 81Denton/ghost-sounds
Reduces sound volume for some ghost notifications
2019-01-06 21:40:40 +13:00
Tad Hardesty
3b2c0e27f7 Scope various unscoped locate() calls (#42195)
* Scope locate calls which are immediately checked against a list

* Remove silly use of locate from bible Topic

* Scope various locate calls (needs testing)

* More WIP

* Buff up lightswitches while we're here

* Tidy record browsing code

* Scope a few more locates

These have caused problems in the past (#41917, #39303). Continues #29349.

Also cleans up lightswitch code while I was already touching it.

I recommend a testmerge.
2019-01-06 20:39:27 +13:00
Jordan Brown
27138810ad Merge pull request #42197 from coiax/fixes-spontaneous-brain-trauma-runtime
Fixes Spontaneous Brain Trauma runtimes
2019-01-04 10:15:14 -05:00
nicbn
c4213f13ab New() -> Initialize() (#41876) 2019-01-03 18:56:15 -08:00
oranges
8736493c02 Merge pull request #42182 from coiax/fixes-void-popping
Fixes mobs being left in inconsistent state with the Void mutation
2019-01-04 13:15:10 +13:00
Denton
24c71eb7a7 Reduces sound volume for some ghost notifications 2019-01-03 10:49:41 +01:00
Jack Edge
c70aeb8dc9 Fixes Spontaneous Brain Trauma runtimes
🆑 coiax
fix: The Spontaneous Brain Trauma event now has a range of possible severities,
and no longer runtimes.
/🆑

In addition, I changed the description/names of some pills to make them more
accurate, and added some neurine pills, because I needed them for testing.

With thanks to @oranges for spotting the runtime in the first place.
2019-01-02 23:25:33 +00:00
duckay
e69901d6dc chance to get the standard red spacesuit from syndicate space suit boxes (#42147)
* Update uplink_kits.dm

* Update uplink_kits.dm

* Update uplink_kits.dm

* gringo

* dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
2019-01-02 15:54:00 -05:00
subject217
5a52f8a7bf Removes smugglers satchels (#42166)
* Removes smugglers satchels

I love the cutie reading this

* remove smuggler's satchel from code

* removes all smugglers' satchel persistence code

* removes remaining things

storage component for smugglers, the miracle ruin (uses smugglers), the dme
2019-01-02 15:28:26 -05:00
Qustinnus
62f61a5867 [READY]New durathread content and durathread modifications (#41959)
* durayeet

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

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

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

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

* Update code/modules/clothing/masks/miscellaneous.dm

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

* Update code/modules/clothing/under/miscellaneous.dm

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

* yeet

* adds armor

* webedits yeet

* adds crafting stuff and removes normal cloth crafting

* ff

* final fixes

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

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

* done
2019-01-02 14:31:06 -05:00