Commit Graph

24459 Commits

Author SHA1 Message Date
Viz
24248d0ccb Removes instant stuns from Sleeping Carp (#18219)
* open rp, kicks ur ass

* Stay down

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Get your fins off me!

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-06 19:50:13 +01:00
Charlie
3980f2dd77 stun and telebaton rework (#18127)
* stun and telebaton rework

* batons now do stamina

* makes it work

* indicator

* tweaks

* farie review

* moxian review

* sod it
2022-07-06 20:46:52 +02:00
KalevTait
b7dad1801d terror spiders (#18216) 2022-07-06 19:32:44 +01:00
Sirryan2002
0c80bda49d adds istype check (#18228) 2022-07-06 19:31:46 +01:00
KalevTait
d8b3275213 hostiles (#18230) 2022-07-06 19:31:29 +01:00
KalevTait
1ba1f89a96 Code Readability - Clothing (#18178)
* clothing

* removed implied src

* Remove 'as mob' as per suggestion

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* use #define SECONDS as per suggestion

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Apply suggestions from code review

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

* Prefer BURN to "fire"

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-07-06 12:49:21 +02:00
alex-gh
fc2b99bd51 Surgery refactors (#18183)
* Remove dead code

* Refactor magic numbers to defines
2022-07-05 21:20:38 +02:00
S34N
1ad219e02a Revives "Updates ERT gear and adds holo stretcher #16266" (#18139)
* Updates ERT gear

* Apply suggestions from code review

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

* Reformats new vars

* Update code/game/objects/items/weapons/storage/boxes.dm

Code Clarity

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

* Removes unneeded item

* BULK

* repath time

* moxian review

* le beds

* haha webedits

* bubble review

Co-authored-by: warior4356 <warior4356@yahoo.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2022-07-05 18:47:20 +02:00
KittyNoodle
a1cc619421 Punch stuns now knockdown instead of hard stunning. (#18191) 2022-07-05 16:10:58 +02:00
Vi3trice
179b75f3a7 Gloves, shoes and suit storage are properly obscured on the player when wearing the appropriate gear (#18190)
* nothing at all

* Oh, and the blood too.

* Oh, and blood
2022-07-05 16:07:17 +02:00
S34N
52f3323760 makes these lasers (#18209) 2022-07-05 13:41:48 +01:00
KalevTait
ad608c84e3 atmospherics (#18152) 2022-07-04 10:41:18 -05:00
Viz
c644fd0384 I HATE INSTANT STUNS! I HATE INSTANT STUNS! (#18196) 2022-07-04 09:28:22 +02:00
Farie82
422f40b670 Makes it so the baseturf on lavaland is lava, not space (#18193) 2022-07-03 22:28:19 +01:00
Viz
77767b8986 Untases your slug (#18185) 2022-07-03 22:12:44 +01:00
Charlie
9a8647194f buckling (#18203) 2022-07-03 20:51:21 +01:00
PacifistDalek
bfdce2966a Absolute Heresy (#18182) 2022-07-03 12:09:57 +01:00
moxian
e3b5527576 Fix several runtimes with remote welderbombing (#18137) 2022-07-03 00:38:01 +02:00
Kugamo
9a8d6da7ab New TEG sprites (#18085)
* amogus

* Revert "amogus"

This reverts commit ebaa99c77b.

* T E Gee

:D

* adjusts sprites slightly

TEGs taller now, I though they looked too short b4

* makes pipe connection nicer

* Emissive Devices

yep

* suggested changes

Moved update_icon() call out of atmos/process, which was calling it multiple times a second, and into return_transfer_air() which is the only place where the critical variable is redefined.

* readds conflicted changes

* bruh

* SteelSlayer Suggestion

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

* removes duplicate proc

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-07-02 12:45:24 -05:00
AffectedArc07
3c00a1f061 Removes cortical borers. No, I am not sorry. (#18161)
* Removes cortical borers. No, I am not sorry.

* Icon purge
2022-07-01 23:25:01 +01:00
moxian
aaf1eae36c Fix a runtime in dna vault Initialize (#18172) 2022-07-01 15:42:11 +01:00
Marm
51f870595e Nerfs Deathnettle (#18128)
* Nerfs Deathnettle (I hate plants)

* Update nettle.dm

Early returns are good apparently.

* Stage of grief: fear

Should fix errors?

* Update code/modules/hydroponics/grown/nettle.dm

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-06-30 19:00:29 +01:00
Charlie
bead47ea29 Adds crawling. (#17899)
* crawling?

* knockdown. CONTAINS CHANGES THAT NEED REVERTING

* plotting can_moves death

* CANMOVE IS DEAD

* mappers are insane

* removes todos as the are todone

* decreases crawling speed

* silly-con fixes

* surgery fixes

* fixes death

* pAI fixes

* removes var/lying

* runtime fix

* decreases default crawling speed

* correct crawling dir

* some more fixes

* stunbaton tweak, revert later

* rejuv fix

* restraint and incapacitated refactor

* crawling dir in line with TG

* fixes vehicle movement and grabs

* alien rest fixes

* antistun fixes

* fixed fall sounds

* forgor to stage this

* first review

* canmove zombie dispersal

* fix

* lots of fixes

* defines

* fixes the trait helper

* if you got no legs you can still crawl

* sillyconfix

* no reverty keepy

* jaunt fix

* hopefully fixes perma sleepy zzz

* admin rejuv temp fix

* rest canceling

* antistun chems now remove knockdown

* buckle offset fix

* fixes some stuff

* crawling delay = 4

* descuffs bed

* sleeping hotfix

* fixes simple mob resting

* V is the macro for resting

* projectiles no dodgy

* refines the projectile check

* god I hate strings

* MORE FIXES

* I hate buckling

* fixes capulettium plus

* winding down

* farie review

* bugs did stop showing up

* SEAN

* todo

* sean review

* ed209

* i HATE cyborgs

* steel review

* laaaaaast things

* reverts stun baton changes

* and done
2022-06-30 11:57:52 -05:00
datlo
5e2f62800c Buffs stun absorption to stop disarms. (#18126)
* Disarm is now stopped by stun absorption

* update comment
2022-06-30 14:29:26 +01:00
Contrabang
1805d5e7d5 and then there was speed (#18120) 2022-06-29 21:22:24 +01:00
Will "squid.mid" Bohlen
e291a8c779 Quieter radio emotes (#18103)
* Fix Radio Emotes

Fixes #14748

* Make emotes audible

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2022-06-29 10:22:07 +01:00
moxian
09e7f54a43 Convert most of /obj/machinery to use Initialize rather than New (#17845)
* Switch a bunch of /obj/machinery from /New to /Initialize

This is an easy and uncontroversial batch.
No globs, no late init, and stuff.

* Move more machinery to Initialize

This time the ones dealing with GLOB vars,
as well as some simpler ones i missed previously.

* More tricky New -> Initialize migrations

* The last of machinery Initialize conversion

* fixups

* Newscaster armor fix

* styling

* Comment on armor handling

* Move newscaster armor definition back to datum

* farie82 review

* kill extra .=

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

* farie's review part 2

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-06-29 08:33:52 +02:00
S34N
3807bf43c7 [GBP no update] Minor refactor to reflecting projectiles, detgun fix (#18114)
* initial

* change these please

* let it not ignore carp, i suppose

* this instead

* review, fixes

* charlie code
2022-06-28 22:37:04 +01:00
alex-gh
bb36a5b0d1 Fixes surgery cancellation bug/exploit. (#18097)
* Sawing somebodys chest or head open breaks the affected bone

* Silences the screams
2022-06-28 17:30:27 +01:00
moxian
244108e921 Fix a runtime in jobban handling (#18119) 2022-06-28 12:04:27 +01:00
Vi3trice
8753e22a8e Rework toy card decks into standard decks (#17925)
* Go fish

* Keep forgetting about the map

* Forgot about the sprites for the double deck

* Cleaned things up

* Fix icon conflict

* Update cards.dm

* Improper tweaks

* Update cards.dm

* Axing the popup from the toy version entirely, that was a little jank

* Meta remap was merged

* Huh. \improper was the issue.

* Update cards.dm

* Few changes and a fix

* More changes

* Update cards.dm

* Update cards.dm

* Update cards.dm

* Merge branch 'master' into go-fish

* Update cards.dm
2022-06-27 22:38:15 +01:00
moxian
da2120f60d Fix runtime with borgs deathgasping (#18109)
* Fix runtime with borgs deathgasping

* farie's wonderful suggestion

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-06-27 14:25:50 +02:00
KalevTait
faf173b35c Glass container reagents saftey check (#18096)
* changed fake disintegrate to not need a permit (as far as sec bots are concerned)

* prefer boolean defines to magic numbers

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

* added check

* Update code/modules/reagents/reagent_containers/glass_containers.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-06-27 13:25:34 +01:00
Deniz
3c0603f7ea Alien Queen is now, indeed, dead (#18113) 2022-06-27 13:24:14 +01:00
Sirryan2002
92e9a86dfb adds qdel (#18101) 2022-06-26 21:44:06 +01:00
AffectedArc07
d538100ceb Shift+F3 debug menu (#18065)
* F3 debug menu

* Some tweaks

* So that escalated

* Update code/controllers/subsystem.dm

* Update code/controllers/subsystem/debugview.dm

* Charlie tweaks
2022-06-26 20:10:09 +01:00
Bm0n
d43eb77b25 Replaces Free Guns From Sci With Parts Kits (#17918)
* rip sci powergamers

* grammar

* apparently i don't know how to spell

* code review

* +to

* oook

* a over the
2022-06-26 18:53:03 +01:00
KalevTait
a0a1f2bbf4 Fix cutting meat to be consistent with itself and cutting other food items (#18092)
* make scalple work to cut cutlets into bacon

* Fix displayed messages to work with scalpel, and brought formating in line with everywhere else in the game.

* brings messaging for cutting meat in line with messages for other actions in the game.

* removed the extra 'the's from the the messages

* Add space between arguments in function call

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-06-26 17:43:49 +01:00
DamianX
645759d9df Admin spawn verb QoL (#18063) 2022-06-26 15:35:15 +01:00
Luc
1aaf3d6315 Make monkey death/gasps not travel through walls (#18080)
* Make monkey death/gasps not travel throguh walls

* based off of mind instead of monke
2022-06-26 15:33:10 +01:00
moxian
1f39be6cfb [GBP no update] Fix the display of the zone being operated on during the surgery (#18087)
* Fix the display of the zone during the surgery

* wrecks => rips. Better english
2022-06-26 11:32:41 +01:00
moxian
59b91e7c37 Fix runtime in mass-hallucination event (#18093) 2022-06-26 11:24:55 +01:00
S34N
705578b23b Energy detective revolver (#17771)
* Initial defines

* more work

* icon

* more stuff

* UID not hard ref

* tidying

* overload go brrt

* le sound and dead cell

* delet gap

* initial chargepack stuff

* simplify

* oops

* yeet this

* placeholder sprites

* oops magic number

* the gun speaks!

* consolidation

* tweaking and tidying

* so long old gun

* icon purge

* reapplies placeholder

* 1 minute tracker, not two

* makes it use a pinpointer

* revert tiny map changes

* cease your tracking, fool

* oops

* soft refs

* charlie review

* projectile ref to firing obj, removes testing overrides
& cleans up signals

* some more UID null checks

* ICONS

* ICONS CONFLICT

* MORE ICONS

* makes it freaking work

* first pass fixes

* charlie review

* charlie review 2, variable boogaloo

* fixes holsters

* colours the overcharged shot

* and recolours tracker to be yellow to match charge

* yellow laser icon

* widen overcharge misfire %

* fixes unlinkable pinpointers

* fixes gun not speaking when tcomms setup is changed

* steel request

* no chargey

* loudening 2022

* steel part 1

* Apply suggestions from code review

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

* restores missing sprites

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-06-25 20:15:09 +01:00
DamianX
3582787514 Added set_stat setter for mob/var/stat (#18079) 2022-06-24 21:39:43 -05:00
moxian
f4bd86cc5e Surgery on napping people wakes them up. (#17661)
* Surgery on napping people wakes them up.

* Fix a potential afreeze issue

* Code review

* has_status_effect now returns `null` if no status effect

* move `voluntary` to be an arg to New

* Update code/modules/surgery/helpers.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* And this other IsSleeping call

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-06-25 00:20:24 +01:00
S34N
5f58a80d8a Let admins allow ERT borgs to choose sec modules (#17874)
* Let admins allow secborgs in ERT

* dont force them to be secborgs

* fixes up some logic

* remove this

* Update code/modules/tgui/modules/ert_manager.dm

* le indent

* deconflict

* tgui deconflict

* Update code/modules/tgui/modules/ert_manager.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-06-25 00:07:18 +01:00
Kugamo
d97c8cb6eb Gloves now dyeable again (#18077)
* wow, this is just like one of those japanese animes...

* ok

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-06-24 17:46:16 +01:00
DamianX
06768b96a3 Added time dilation tracking (#18061)
* Added time dilation tracking

* Update code/controllers/subsystem/time_track.dm

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-06-24 17:34:23 +01:00
Contrabang
ed203d9f69 Space ruins no longer have lava underneath them (#18047)
* begone space lava, remaps most of space ruins

* removes druglab having DJ station area

* renames "gasthelizards.dmm"

* revert "renames "gasthelizards.dmm""

* goodbye syringe gun, hello turf/template_noop
2022-06-24 10:50:21 +01:00
Mitchs98
dfca7bf993 Antag-Banned Players No Longer Selected In 'Everyone Is a traitor' (#18048)
* antagdenied

* faeriechanges
2022-06-23 20:24:34 +02:00