Commit Graph

6054 Commits

Author SHA1 Message Date
atteria bcf90593ed Improves belt item overlay code, Adds new belt item overlay sprites (#17568)
* belt-improvements-and-sprites

* fixes my fix of botany belt allowed contents
2022-04-12 15:57:21 +01:00
roarbark 731762a451 Adds Nianen Species Flags (#17533)
* Adds nian flags

Adds expensive nian flags to the cargo store, has furled and unfurled sprites.

* flag costs 500

changes the nianen flag to cost 500 credits in the vendor, like the other ones. moves it up a bit to be correctly sorted by price.
2022-04-08 13:28:24 +01:00
S34N e372e95933 Removes gateway missions we don't and won't use (#17530)
* removes gateway missions we don't and won't use

* removes additionals

* Update code/modules/power/singularity/singularity.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* makes things work properly

* tick this please

* and of course this map used some random single gun stolen from another away mission

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-03-29 11:38:56 +01:00
Bm0n 6437de8363 Ports In hand bola sprites from TG (#17525)
* Ports inhand bola sprites from TG

* Should be good now
2022-03-29 10:53:46 +01:00
Charlie e979201a57 Removes tribbles (#17524)
* removes tribbles

* forgot this

* styling
2022-03-28 09:57:10 +01:00
Sirryan2002 8c0ea90d19 BRPED provides user feedback for out-of-range exchanges and prevents false-positive logs (#17527)
* feedback change

* better fix

* even better fix

* Update code/game/objects/items/weapons/stock_parts.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-03-27 11:27:00 +01:00
Lumi 42a94fe37c Grammar and spelling edits (#17485)
* Grammar and spelling fixes

Grammar and spelling fixes

* 'an addition', 'look yummy'

Fixes 'a new addition' to 'an addition', reverts 'looks yummy' to 'look yummy'
2022-03-19 11:01:14 +00:00
Qwertytoforty eb85cc7cb6 I used the supermatter to destroy the supermatter (#17494) 2022-03-17 22:06:23 +00:00
Fox McCloud 550c131d4a Updates Slapping to Allow for Damage (#17463) 2022-03-06 15:18:26 +00:00
Luc ed3454f577 Improve defibrillator messaging (#17429) 2022-03-04 21:36:53 +01:00
Akira Akashi 91b4a93663 make sure improvised gauze doesn't actually heal brute (#17381) 2022-01-31 09:15:14 +01:00
datlo 1c041634c2 Prevent using fire extinguisher to propel vehicles. (#17368) 2022-01-25 09:30:19 +01:00
Qwertytoforty 57eb272399 Remove duplicate tracking implants (#17365) 2022-01-24 14:32:55 +01:00
Charlie a0e5d6df44 Datumized vampires (#17166)
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2022-01-18 21:16:09 +01:00
Qwertytoforty b82c505ff2 Death alarms now use signals, and properly trigger on gibbing / dusting (#17277) 2022-01-09 22:27:56 +01:00
Qwertytoforty 054939b36c Fixes IEDS not working with beartraps (#17272) 2021-12-26 12:26:49 +01:00
Qwertytoforty bc3c8c25bc Fixes watertank mister GC (#17258) 2021-12-20 21:23:51 +01:00
warriorstar-orion 6df11c32df Fix full ashtray icon/descriptions. (#17255) 2021-12-19 19:05:39 +01:00
S34N 0ad8fac9c5 Checks contents of storage items for restrictions (#17236)
Co-authored-by: warriorstar-orion <59303604+warriorstar-orion@users.noreply.github.com>
2021-12-17 10:45:07 +01:00
Farie82 d0329f58a7 Makes borgs GC better. Fixes an antidrop related bug (#17226) 2021-12-16 18:45:50 +01:00
S34N ac6f9b4725 [IDB Ignore] Refactor icon smoothing to use 8-bit bitmasking (#16620) 2021-12-15 17:04:24 +01:00
S34N 487ae739cc Adds missing floors to the floor painter (#17210) 2021-12-13 18:29:47 +01:00
AffectedArc07 636e6b8505 Patches BRPED camera console exploit (#17222) 2021-12-13 12:36:53 +01:00
AffectedArc07 caffb4601e Fixes intercoms not working when in a comms blackouts (#17208) 2021-12-11 12:50:43 +01:00
AffectedArc07 2d5736a61c Removes brig phys, adds another officer slot to compensate (#17180) 2021-12-06 15:00:43 +01:00
S34N 2797b60bc1 Adds support for more "[dir] bump" mapping (#16908) 2021-12-03 08:10:11 +01:00
AffectedArc07 2781d3ffaa Fixes my idiocy (#17183) 2021-12-02 14:43:22 +01:00
AffectedArc07 1dec9a0cb9 Adds a warning message for admins for an exploit (#17182) 2021-12-02 12:37:26 +01:00
Charlie 31b336da64 minor external organ refactor (#16183)
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2021-12-01 22:17:44 +01:00
Vi3trice fa275ffe74 Fix - Bodybag tags don't disappear when opening/closing the bags. (#17164) 2021-11-28 09:40:09 +01:00
Charlie 40222cdd6e Fixes some runtimes where mobs were spawned in nullspace (#17158) 2021-11-26 10:22:00 +01:00
SteelSlayer 93908eefc8 Antag datum clean up/refactor (#15084) 2021-11-25 08:29:46 +01:00
Farie82 c4cda0930f Reworks the morph. Makes it a more stealth ambush oriented antag (#15208)
* Reworks the morph

* Hunger points. Reproduce. Sprites. Other tweaks

* vent open. Convert to spells. Valid checks. Minor tweaks

* undo life hack

* Icons, Fixes, No more morphed lights

* Item eat fix. All eating takes 3 seconds

* Add sounds

* Fixes and tweaks. Pass airlock ability. Ambush screen alert

* Steel review fixes

* New dead morph sprite from Pewtershmitz

* Pass airlock sprite provided by Pewtershmitz

* No barsigns or cryo cells as mimic

* Gluttany ruin change

* Color fix. No forms fix

* fix the stupid icons

* Apply suggestions from code review

Co-authored-by: dearmochi <shenesis@gmail.com>

Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
2021-11-17 17:25:59 +01:00
Fox McCloud 55a6c23bc7 Removes civilian: Return of the Assistant King (#17103)
* Removes Civilian

* other alt-titles as well

* further resolution

* forgot these

* TGUI

* hud icon
2021-11-16 19:49:08 +01:00
variableundefined a5c65002b5 Merge pull request #17100 from Adrer/Cabinet-doors-2-electric-boogaloo
Fix cabinet doors 2: Electric boogaloo
2021-11-14 15:37:04 -06:00
Charlie 634f9c72f1 Vampire Rework. (#16476)
* vampire rework

* fixes and tweaks

* cleanup + tweaks

* grug stomp

* TGUI

* TGUI rebuild

* UID fix

* debugging cooldown fix

* first review changes

* subclass refactor

* tweaks + some sprites

* blackbox logging

* tweaks + grammar

* minor UI tweaks

* ability icon sprites.

* placeholder sprite warning fix

* melee mod code comment warning

* nullification rework

* final sprites!

* fixes

* sabre review pt 1

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* sabre review pt2

* sprites readd

* tgui rebuild

* removes traitor vampires

* fixes

* readds sprites

* runtime fixes

* hotfix

* more runtime fixes

* glare tweak. less confusing when the vampire is stunned.

* gargantua nerf

* minor tweaks.

* hemomancer nerfs

* bugfixes and cleanup

* I did a dumb

* couple of fixes

* confusion and shadow snare fixes

* hemomancer nerfs part 2 electric boogaloo

* TGUI rebuild

* fixes and easier events

* Umbrae tweaks

* gargantua tweak

* umbrae nerf 2 electric boogaloo. also var edit suggestion

* runtime fix

* buffs blood nutrition to be in line with its metabolic rate

* Henk stuff

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* more review changes

* final tweak

* affected request + runtime fix

* FUCK

* fat fucks

* darkness tweaks

* UMBRAE AAAAAAAAAAAAAHH

* force doors bugfix

* either git or I am drunk

* admin rejuv fix

* I CANNOT SPELL

* shitnt code

* steel review

* tgui rebuild

* mochi review

* vampire ability usage logging

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-11-14 15:34:56 +01:00
adrermail@gmail.com 531bb709b6 Fix cabient doors 2 2021-11-14 14:09:31 +01:00
datlo f92f20c74c Fix cult structure stacking exploit (#17091) 2021-11-13 16:15:24 +01:00
Fox McCloud 06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01:00
variableundefined 9f2f9ac45e Merge pull request #17038 from E-MonaRhg/carpet-stuff-two
The Subsequent Carpet PR: tweaks and tables edition
2021-11-07 10:24:47 -06:00
variableundefined 1739f411a2 Merge pull request #16823 from S34NW/3/4th-closet
3/4ths Sprite Project: Closets
2021-11-06 14:19:14 -05:00
SweetBlueSylveon 2fdcbf8551 Grey Plushie Get! (#16991)
* Adds a Grey Plushie

Adds a grey plushie to the game, putting it as a loadout option, and adding a new sprite.

* Adds water interaction

Adds a water_act to the plushie. The plushie will now changed to "grey_singed" when touching water.
Upon touching water the plushie will scream and go "AAAAAH!" which then puts all text and audio interactions onto a 300 cooldown.
The plushie can also be hugged to make it go "Ow..." if its icon is set to singed. This is on the same cooldown as vox screams.

* Minor fixes

Fixes minor syntax and redundancy problem in the code.

* Updated sprite

Adds new sprites for grey_plushie and grey_singed.

* Converts Cooldown and spawn system to timer.

Changes the cooldown and spawn system to a timer and callback system.

* Update code/game/objects/items/toys.dm

Adds early return.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Update code/game/objects/items/toys.dm

Simplifies code, corrects mistakes.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Complicated

-Splits the cooldown variable and proc into two, one for hugging one for screaming.
-Adds more BOOLEAN
-Properly implements Timer and Callback system.
-Adds early returns.

* Revert "Complicated"

reverts dme changes.

* Adds an if statement

Adds an if statement so that the server is not setting the icon and description every time the plushie gets wet.

* Minor correction

Fixes the order of the if statement and changes its type.

* Reverts test change

Last commit had testing changes I failed to revert before pushing.

* Changes the sprite.

-New, smaller icons.
-Slightly heavier shading.
(Can be undone and edited further, I still have the other sprites)

* Another sprite update

-I learned to use HSL.

* Small bugfix

Last code update I wrapped the screaming proc into the "don't set the icon and description if it's already singed" by accident. Swapping them around fixed it, and it will now be able to yell from water every 30 seconds again.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-11-06 17:34:17 +01:00
E-MonaRhg ac68ea59df Carpet and table stuff 2021-11-05 19:46:42 +02:00
datlo d94210031b Refactor C4, subtypes, and airlock ex_act (#16995)
* Refactor C4 and Airlock ex_act

* update uplink desc

* Replace ismob by carbon, clarify comment

* remove unnecessary ismob check

* replace destroy by qdel, fix comment

* auto doc comments, add else condition

* Add comment to shaped c4

* Shortens shaped boom proc, make airlocks more resistant against light ex
2021-11-05 10:12:09 +01:00
hal9000PR 3b7e9fee93 refactors butchering of humans with chainsaw/meatcleaver (#16812)
* traits

* examine

* I am incapable of writing

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* people

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-11-05 09:11:10 +01:00
SabreML 1c3c2c22ad Name Capitalisation Tweaks (Weapons) (#16906)
* Weapon names

* Assault rile

* More #coding_chat tweaks

Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.

* Missed these
2021-11-04 19:47:31 +01:00
variableundefined 2684afc85b Merge pull request #17027 from Sirryan2002/birdsarentreal
Fixes a spelling mistake in implanter.dm
2021-11-03 20:08:01 -05:00
Sirryan2002 6f405149f2 spell check 2021-11-03 02:02:18 -04:00
Luc b527838507 Fix abductor closet cloning mats (#16985)
* Update abductor closet to only drop one alloy

* Revert, make it just cost two alloy to make
2021-11-02 22:07:46 -06:00
S34NW 1723e0b503 Merge branch 'master' into 3/4th-closet 2021-11-01 10:14:41 +00:00