Commit Graph

24908 Commits

Author SHA1 Message Date
Vi3trice
c4f9086b38 Orbiter component now uses lock_in_orbit parameter, allowing for orbiters that always stay with an atom (#19278)
* Wisps shouldn't get disturbed by the shuttle anyways

* Why on earth wasn't it even using that?

* Update orbiter.dm
2022-10-16 15:28:20 +02:00
GDN
e510680a20 adds blackbox logging for revival (#19399) 2022-10-16 12:33:41 +01:00
Luc
b25046d0d7 [GBP: NO UPDATE] Fixes robotic surgery issues (#19253)
* Fixes robotic surgery issues

* Update code/datums/components/surgery_initiator.dm

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-15 13:50:48 -05:00
S34N
edeba92326 Smoke spells readability (#19387)
* read the smoke

* oops

* contra

* contra

* more tidying

* last one

* Update code/modules/projectiles/projectile/magic.dm

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-15 18:05:55 +02:00
Farie82
a7179d97bf Makes wormhole projector portals spawn effects once every 0.5 seconds max (#19398)
* Refactor the parameters and starting the teleport

* Adds arguments and moves the default effect generation up to do_teleport

* Typo in arguments

* portals now only create sparks every 0.5 second when things pass through

* Comment fix
2022-10-15 11:40:32 +01:00
Contrabang
34309c24b8 Fixes mulebots not being screwable (#19348)
* fixxy fixxy

* farie review

* s34n review
2022-10-15 09:25:02 +02:00
SteelSlayer
79f9761a63 fix alerts not appearing (#19385) 2022-10-15 00:21:43 +01:00
matttheficus
7bb99cb7bd Contractor Post-Prison Injuries (#19116)
* it begins

* Test Number One

* it works, i can now break you

* fix vars

* pickproc

* pickproc 2 electric boogaloo

* indentation is hard

* slime/IPC check

* spacing

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

* spacing 2 electric boogaloo

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

* slime/IPC returns

* oops 2

* null checks

* more changes

* farie review

* spellcheck via lewcc

* farie review

* early return

* today matt forgets how to do logic problems

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-14 13:34:29 +02:00
Qwertytoforty
4c13246d30 Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5 (#19170)
* Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5

* grammer / typeblock

* 15 is not more than 15

* how did I miss this, I swear I put in 3

* path + crafting

* Update code/modules/crafting/guncrafting.dm

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-14 08:28:07 +02:00
PopeDaveThe3th
597a5a1801 Removes ability for facehuggers to target corgis (#19354) 2022-10-13 22:03:09 +02:00
Vi3trice
59dfdba201 Everything else through the door (#19358) 2022-10-13 21:56:58 +02:00
GDN
313495d36e Puts paper on layer 3 (#19344) 2022-10-12 20:19:07 +02:00
Charlie
bc79020037 fixes hallucination shocks (#19361) 2022-10-12 11:09:55 -05:00
Contrabang
c74af494b3 [TGUI] Temp gun (#19350)
* temp gun temp gun

* formatting

* sirryan review + changed process() for performance

* oops

* fixes radios

* Revert "fixes radios"

This reverts commit e932d63310.
2022-10-12 10:57:27 -05:00
Vi3trice
43114ebd85 Admin Maximize Research applies to all tech types (#19320)
* That's not used anymore

* Nevermind, it could possibly wind up getting used thanks to economy

* Update rdconsole.dm
2022-10-12 12:45:24 +01:00
Shadow-Quill
3958de2de4 Adds some examine helpers (#18997)
* Adds some examine helpers

* Includes suggestions

* Macroifies some "the"s

* Update code/game/machinery/camera/camera.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Apply suggestions from code review

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

* Update code/game/objects/items/devices/radio/intercom.dm

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-10-11 08:11:23 +01:00
Contrabang
cb513cf52e [TM] [TGUI] Kitchen Improvements (#19165)
* this got a bit... out of hand

* update icon

* extra lines begone

* soundfix

* sirryan review pt1

* fuck I accidently deleted a line

* sirryan pt2

* AA suggestion

* more review

* hooooly crap

* lewcc review

* reviews

* table

* merge master

* Revert "merge master"

This reverts commit c3ec73a0f8.

* bundle css

* reviews and revival

* fuck I missed a file

* steel review
2022-10-11 00:06:03 -05:00
DevanStrife
207562c1cb Legcuffs and beartraps show up on examine (#19298)
* Update README.md

* Workin now

* Github being a b again...

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

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-10-10 23:49:19 -05:00
DevanStrife
197db5df9f Fixes invisible in-hand pai sprite if the pai is resting (#19296)
* Update README.md

* Works as intended now

* did an oopsie somehow
2022-10-10 23:40:01 -05:00
warriorstar-orion
71cf58d8a5 Only give bots HUDs when player-controlled. (#19198)
* Only give bots HUDs when player-controlled.

* Clean up data_hud regardless of whether or not a player is present.

* No need to keep around this ref.
2022-10-10 15:20:55 -05:00
Nathan Winters
ed39233fe0 Check target fullness before tranfering pill contents (#19321) 2022-10-10 21:24:17 +02:00
Luc
302dfba07a Fixes cursed heart overlay sticking around (#19275) 2022-10-10 21:13:35 +02:00
Vi3trice
2d58bc6066 Now you can have proper fancy energy guns (#19272) 2022-10-10 21:07:09 +02:00
Vi3trice
20c437f7d2 linters do your magic (#19263) 2022-10-10 20:58:41 +02:00
Vi3trice
9e90c81282 Defining Part 1 - Code cleanup toward defines (#19262)
* This is only the beginning

* Update stack.dm
2022-10-10 20:50:29 +02:00
FloFluoro
620b42c356 Tweaks mass hallucination midround message (#19304) 2022-10-09 22:19:46 +01:00
Octus
000df7c2f9 Nerfs Vampiric Claws (#19303)
* nerf THIS

* funny claws go brrr
2022-10-09 22:18:55 +01:00
ElorgRHG
e843567671 Clothing (jumpsuit) DMI split, unused jumpsuit sprite purge along the way (#19092)
* Medical and RnD DMI files split

* Cargo DMI split

* Security DMI split

* Engineering DMI split

* Captain DMI split

* Civilian/service DMI split

This one hurt

* Forgot about this one

* Color DMI split

* Purges everything that was delted up until this point

... with a blindfold and a shotgun

* Dress and suit DMI split

* Pants and shorts DMI split

and merges pants and shorts files... shorts are pants, right?

* Donator/fluff jumpsuit clothing organisational relocation

* e

oops

* So this is used, repath bad

* Random commit

* Costumes DMI split and jumpsuits purge

* Some fixes

* pennywise

* Centcom DMI split

* SolGov DMI split

* Retro DMI split

* Syndicate DMI split

* Misc DMI split

* centcom officer

* Kills off uniform.dmi completely

* last fixes

* lastest fixes

* vox navy gold conflict

* civilian barber

* Tourist observers work now

* Hopefully working non-human humanoid clothing

* This being in suit.dmi is one of the reasons I made this PR

* This shouldn't be here

* Late night coding

* Pun Pun regains his drip

* Last fixes

* security/OFFICER

* Most important - clown fix

* working subtypes good

* Fixes chameleon jumpsuit

* Proper QM pathes

* Fixes jumpsuit rolling with the power of poor quality code

* Cargo tech character setup fix

* else instead

why didn't I do this in the first place

* PURP

* Fixes broken character setup job clothing

* CC suit fix

* Psychedelic jumpsuit proper path

* You must wear the jumpsuit to adjust it
2022-10-09 14:24:10 +01:00
FloFluoro
47d9783d70 Plant data disks can now be cmagged (#19273)
* Plant data disks can now be cmagged

* Changed usr to user

* Now uses update_appearance()
2022-10-08 12:03:43 +01:00
S34N
7b5a60ef93 New newscaster sprites (#19251) 2022-10-08 12:02:21 +01:00
Vi3trice
c59330f7b5 So long (#19291) 2022-10-08 11:04:21 +01:00
Qwertytoforty
4596f0fa18 Ports new Fulton beacon sprite from tg. (#19254) 2022-10-08 11:02:28 +01:00
FloFluoro
c7db0bb208 Terror Prince attack now (also) does stamina damage (#19284) 2022-10-08 10:55:58 +01:00
Henri215
e4bfa0e2f7 Fix #18872 Shark teeth is no longer invisible (#19229)
* picks teeth icon instead of shards (large/medium/small)

* Update code/modules/fish/fish_items.dm

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

* contrabang suggestions

* suggestion

* Apply suggestions from code review

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

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

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

* verb and state icons

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-07 13:49:43 +02:00
Farie82
1c8ca76a6e Ensures the gibber "feed" animation does not block the calling code (#19232) 2022-10-06 22:31:03 -05:00
Vi3trice
a9baf739f5 Diona nymphs eject from dionas if a species change occur (#19283)
* Give the little fellas a break

* Hopefully non-dionas do not get nymphs

* Update code/modules/mob/living/carbon/human/species/diona.dm

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-06 22:23:56 -05:00
Henri215
dbd60a179e Adds cap revolver ammo and toy cuffs to prize counter (#19245)
* added cap revolver ammo and toy cuff, did sort by cost too

* Update code/modules/arcade/prize_datums.dm

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2022-10-06 22:07:18 -05:00
Henri215
a44a9c764a Linen bin/ashtrays/coin presser tweaks (#19207)
* tweaks for linen bin and ashtrays

* Apply suggestions from code review

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

* deleted empty line

* coin presser can now be unfastened

* Update code/modules/mining/mint.dm

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

* suggestion

* rewind time

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2022-10-06 09:58:27 -05:00
Contrabang
8418997ed8 Moves most screwdriver checks to screwdriver_act (#19024)
* screwdriver_act my beloved

* convert to returns instead of . / lewcc review

* it will be done

* i'm a little bit stupid, but now time to test

* sometimes I get excited and press the commit

* The great test has been completed

* oh wow oh wow, lewc review

* found one last one

* Steel review

* Lewc review

* quick sirryan review

* removes stupid comments (old coders I blame)

* sirryan review two

* whoops...

* hal review

* the fix to the fix to the fix

* Revert "the fix to the fix to the fix"

FUCK I pushed to the wrong branch
This reverts commit a96fe98781.
2022-10-06 09:30:33 +01:00
Vi3trice
6933ed99fd So this was wrong, again (#19274) 2022-10-05 22:59:33 -05:00
Farie82
7211b6d9f5 No longer need to have slimes with body parts to remove their cores (#19230) 2022-10-05 22:50:55 -05:00
GDN
06d04e23ab Golem Clarification (#19196) 2022-10-05 22:43:40 -05:00
GDN
ec9142c238 Species now have their innate actions GC (#19212) 2022-10-05 22:29:31 -05:00
McRamon
888c78e160 New ability icons (part 1) (#19261)
* Removes unused sling icons

* first wave of icons

* more icons and stuff

* more icons and fixes

* mindswap fixed

* more actions.dmi adjustments

* some more

* dust biochip unique icon

* small fix

* test

* Update actions.dmi

* mhm

* reverse of some changes that are pointless as it stands

* Update implant_dust.dm

* bio-chip icons

* dust_implant new icon path

* missing icon for human form cling ability added

* removed the directional icons of the immrod action icon (yes)
2022-10-05 22:54:38 +01:00
Qwertytoforty
02a66d2cd9 ancient goliaths now have their own trophy like other shiny lavaland mob. (#19222)
* ancient goliaths now have their own trophy like other shiny lavaland mobs

* Update code/modules/mining/equipment/kinetic_crusher.dm

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-10-05 11:01:54 -05:00
Luc
56a5753d3d Lets you deepfry ice (#19200)
* Allows for deepfrying ice

* formatting

* Almost forgot this

* Spacing

* Sure, scream too

* Changes oil reaction a bit
- Cooking oil now burns off to an inert version
- The oil deposits yellow oil on the ground too

* FUck I deleted iodine

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

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

* Steel review

* review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-10-05 16:57:47 +01:00
Henri215
aba36033d8 AI cryo now respects too early to ghost (#19215) 2022-10-04 22:23:56 -05:00
Adri
b0b7146793 Fixes the immovable rod not despawning (#19174)
* Fixes the immovable rod not despawning

* Replaces constant endturf checking with an endturf effect

* Revert "Replaces constant endturf checking with an endturf effect"

This reverts commit b7bf5aa413.
2022-10-04 16:40:44 +01:00
Contrabang
0fbfa2ca0d Adds "Highlights" to the Orbit menu (#19168)
* adds highlights

* comment update

* misc support

* weird spacing begone

* requested changes
2022-10-03 19:02:04 -05:00
Henri215
61c4d66f16 anchored desk bell cannot be picked up anymore (#19260) 2022-10-03 22:18:43 +01:00