Commit Graph
54741 Commits
Author SHA1 Message Date
Vi3triceandGitHub 7a3f2ed506 Port TG pointing to inventory thought bubble, and expand valid pointing targets (#19072)
* Well that actually works

* Update atoms_movable.dm

* Now you can point at things inside of things.
2022-09-25 17:29:51 +01:00
AdriandGitHub c76b165a6c Fixes NNO uniform on vox covering their tail (#19075)
* Fixes NNO uniform on vox

* Fixes merge conflict
2022-09-25 17:28:27 +01:00
cf8df529e5 Fixes anomalies spawning in walls (#19064)
* Fixes anomalies spawning in walls

* break

* Update code/modules/events/anomaly.dm

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

* better log message

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-09-25 17:27:27 +01:00
Henri215andGitHub 4b1bae4de4 "None" and "Slime Jelly" blood types added for the appropriate species (#19045)
* none and slime jelly blood types

* random b_type instead of A+ only
2022-09-25 17:25:58 +01:00
S34NandGitHub 39b335b2f1 Resprites ice cream machine and food cart (#19033)
* kitchen machine

* thing

* mcramon
2022-09-25 17:22:25 +01:00
AdriandGitHub b32f499e72 Removes xenomorphs from xenobiology gold slimes (#19002) 2022-09-25 17:21:17 +01:00
QwertytofortyandGitHub ebd492f3bb Blood drunk will now transform its weapon during melee (#19139) 2022-09-25 17:07:46 +01:00
AdriandGitHub 92696c9999 Admin tools, adds better logging for viruses (#19132) 2022-09-25 17:04:37 +01:00
Henri215andGitHub 1b635a3cbe adds barber kit crate (#19129) 2022-09-25 17:03:50 +01:00
FloFluoroandGitHub 5b60ae5c1e IDs now take priority over PDAs in get_idcard (#19051) 2022-09-25 17:03:21 +01:00
Vi3triceandGitHub ff75cf9d92 Rework firelocks, and update alarm light sprites (#19036)
* when the fix to firelocks is in areas

* Maybe

* Clearer defines

* Removing emissives. I'll explore that again later.

* Revert "Removing emissives. I'll explore that again later."

This reverts commit a5635f5230.

* Brilliance flashed before my eyes (Order of applied overlays matter)

* Figured I'd update the documentation.
2022-09-25 17:03:12 +01:00
SheepandGitHub 5d55358159 Fix #18699 (#19160)
Check the return value for any null values before doing anything with it to avoid
a runtime.
2022-09-24 20:22:26 +01:00
S34NandGitHub e944d58c84 Medical tool resprite (#19048)
* medical tools

* removes war crimes

* tidies this up

* fix this please
2022-09-24 19:20:33 +01:00
Henri215andGitHub de7052c410 locator correct path (#19158) 2022-09-24 11:28:31 -05:00
924e8cc949 Renames non-cybernetic implants to bio-chips (#18937)
* CHIPS

* microchip implanter

* more chips to purge

* bio-chip

* catches more things

* tgui

* final merge changes

* Update code/game/machinery/cloning.dm

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

* oops

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-09-24 14:24:25 +01:00
Henri215andGitHub 6956bc64a8 unbranded foot sprite fixed (#19146) 2022-09-24 12:59:12 +01:00
8fb01a0079 Fix #18731 Mixing bowl now disposes properly (#19144)
* mixing bowl now disposes properly

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

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-09-24 12:57:45 +01:00
Henri215andGitHub af682ac7f9 radiation hood sprite adjusted (#19140) 2022-09-24 12:56:39 +01:00
Henri215andGitHub 1e71b382a2 nopower now stops the production queue (#19133) 2022-09-24 12:55:11 +01:00
34927f05ab Wryn removal v2 (#19112)
* Removes Wryn

* and the sprites

* Fixes

Co-authored-by: Fox McCloud <Fox-McCloud@users.noreply.github.com>
2022-09-24 12:53:34 +01:00
ContrabangandGitHub 0efd7c6c50 ok right branch this time (#19110) 2022-09-24 12:53:13 +01:00
alex-ghandGitHub 73b27768f3 Fix runtimes with Rev malfunction ability (#19126) 2022-09-22 14:23:58 +01:00
ContrabangandGitHub 4f1b1389f7 Ants will no longer spawn on food that is on racks (#19023)
* soup debugging but it goes to the right place

* hal review

* ant improvement

* grammar

* sirryan review

* optimizations

* sirryan review

* im a bit crazy like that
2022-09-21 20:58:56 -05:00
alex-ghandGitHub 14e3752aaf Allow silicons to use electric smart fridges. (#19016)
* Allow silicons to use electric smart fridges

* fat fingers
2022-09-21 20:47:28 -05:00
634e511efc Mechs can now be emaged to remove dna lock and access (#19006)
* Mechs can now be emaged to remove dna lock and access

* Update code/game/mecha/mecha.dm

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-09-21 20:42:35 -05:00
DogeDogIsandGitHub 88f8e60656 BoxStation: Medbay Button (#19000)
* Added the button that opens all doors in medbay.

Added again the button that opens all the medbay entrace doors again in BoxStation.

* Ops, forgot to change IDs

* Updated the medbay

Fix the reception button to work with the doors and moved the light to another location so will  not be in the same wall as the button.
2022-09-21 20:40:12 -05:00
Henri215andGitHub c2aba93317 removed var digestion_ratio (#19114) 2022-09-21 21:50:06 +01:00
LucandGitHub b060b4b6d2 Surgery Hotfixes: Part 1 (#19108)
* Fixes up a few notable bugs with surgery
- Synthetic cavity implants now have a close step (oops!)
- Fixes up logic for intermediate surgery steps

* nah I'll deal with this later

* oops this was unused
2022-09-21 21:46:03 +01:00
QwertytofortyandGitHub 065ffff420 Removes radioactive gel from blobs (#19103)
* Removes radioactive gel

* removes the colour define
2022-09-21 21:45:05 +01:00
LucandGitHub 875eb8a950 Keeps bumped windoors open if someone stands in front of them (#19019)
* Makes windoors stay open if someone's standing in front of them

* Windoor is now held open when you're on the same turf

* I guess we do want to check the mob instead of the floor

* Adds access control to propping open windoors

* Ensure we check both people for access
2022-09-21 21:43:55 +01:00
5e4d0db18a Fix #17543 Genetics UI Block 32 Doesn't Properly Change Gender (#19120)
* fixed gender being stuck in plural at genetics

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

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-09-21 15:14:06 +01:00
AdrerGitHubadrermail@gmail.com <adrermail@gmail.com>
5ad2291eba Summon Guns/Magic can no longer tries to select people who are antag banned. (#19107)
* rightandwrong no longer selects antag banned

* Most recent commit IDIOT

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-09-20 19:45:10 +01:00
ElorgRHGandGitHub d677e31efe White captain's beret for Ian (#19091) 2022-09-20 19:43:36 +01:00
ChristasmurfandGitHub 67481115fc alloweditems (#19102) 2022-09-20 13:26:50 +01:00
GDNandGitHub 9cda5ed786 Buffs Alien Queens (#19106)
* Buffs alien queens

* reviews and bigger queen

* Scoping to humanoid
2022-09-20 13:15:44 +01:00
Henri215andGitHub 0045146643 Fixes spoon/fork inhand sprites (#19079)
* fixed spoon/fork inhand sprites

* no idea how those sprites got removed
2022-09-19 13:33:06 +01:00
AffectedArc07andGitHub 3975e3531d Fix some busted logic (#19105) 2022-09-19 13:00:37 +01:00
Henri215andGitHub 6f61357dc5 no metal rod, mend by using wirecutter (#19104) 2022-09-19 13:00:26 +01:00
QwertytofortyandGitHub d530aeba33 Energy crossbow gunkits now need a laser gun (#19087)
* Lockboxes energy crossbow gunkits

* converts to requiring a laser gun
2022-09-18 22:02:09 +01:00
QwertytofortyandGitHub 5da3a6b843 pyro gloves only work on hands [GBP NO UPDATE] (#19094) 2022-09-18 13:36:23 +01:00
AffectedArc07andGitHub 1d008754da [READY] Bot Refactor (#18930)
* [WIP] Bot Refactor

* No more spawns, sleeps, and working EDs

* Mules

* GC fixing

* h
2022-09-17 12:46:25 +01:00
ElorgRHGandGitHub e4e06f2759 Paradise's soul removal part one of many: Captain's drip and resprite (#18891)
* The sprites and stuff

* Vox re-add

* Why did I do this

* Last tweaks

* Pixel differences

* I have decided that captains need a beret

* I have decided that Ian needs drip too

* This exists sadly

* I forgor the gloves 💀

* CONFLICTSSSSSS

* "empty" commit

* White tunic

I don't get the appeal still

* bluE

* Painful

This will most likely get closed anyway so whatever

* OLD TUNICCCCCCCCC

* Conflicts

* Loadout captain's berets

* More conflicts, yay
2022-09-17 11:13:58 +01:00
ContrabangandGitHub 938fbb5004 magboooooots (#19069) 2022-09-17 10:53:56 +01:00
Henri215andGitHub 3d2092885f Bronze/Glass ashtray now can be made (#19056)
* ashtray crafting

* added timers
2022-09-17 10:51:02 +01:00
S34NandGitHub fdc8a8538a 3/4th safe sprites (#19044)
* new safes

* actually makes the changes
2022-09-17 10:49:06 +01:00
FloFluoroandGitHub 24895dc6c5 Beer2 no longer instastuns (#19040) 2022-09-17 10:47:40 +01:00
warriorstar-orionandGitHub 4874032e80 Reset personnel locker overlays when lock/unlocking. (#19073) 2022-09-17 10:46:55 +01:00
f9defc92bf Adds Fusion Gauntlets to RND (#18804)
* do a once over first

* merge conflict shit

* armor pen to modern stuff

* Apply suggestions from code review

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

* BOY SMELL THEM MERGE CONFLICTS

* icons / final changes

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-09-17 10:45:58 +01:00
AdriandGitHub 516e32fafb When removing traitor role, auto remove the uplink (#19034) 2022-09-17 10:44:34 +01:00
ContrabangandGitHub f86f59f177 Revert "Changes SR to not be an instant and unavoidable revival. (#18910)" (#19089)
This reverts commit 37a3902a83.
2022-09-17 00:15:21 -05:00