cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,576 Commits 26 Branches 2 Tags
304e265e4584b2af0c835da150fd7fb9ec51bbfe
Commit Graph

4555 Commits

Author SHA1 Message Date
Adrer
304e265e45 Firefighter backpack once again generates metal foam (#26282) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-07-26 14:30:23 +00:00
CRUNCH
a8c9e14c9a Refactors the Attackby Proc of 40 Machines (Mostly Concerning the RPED) and RPED Afterattack (#26257) 
* Refactor wooo!

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-07-26 14:30:05 +00:00
Qwertytoforty
26f28cb7e7 A new space ruin, the telecommunications satellite? [100% done, ready for final review] (#25820) 
* THE WORK, IT GOES AND SO IT GOES

* darker yet darker

* more changes

* Almost done, let's post the pr and have some dev people test it out.

* update comment

* small change

* pushing , then we address changes

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* more progress

* final bar lines

* aditional tweaks

* Update telecomns_returns.dmm

* Update code/modules/awaymissions/mission_code/ruins/telecomns.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* sirian changes

* emp weakness, light changes

* no runtimes, shoot borgs

* sorry for all the commits just update to master thanks

* Update code/modules/awaymissions/mission_code/ruins/telecomns.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* fixes

* fixes pathing. Voices

* removes always spawn

* Apply suggestions from code review

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

* more changes

* requested string change

* Update code/modules/awaymissions/mission_code/ruins/telecomns.dm

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

* lewcs final changes

* Apply suggestions from code review

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

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-07-25 18:26:14 +00:00
DGamerL
a04ac32b09 Makes our codebase 1641 ready (#26151) 
* Makes our codebase 1641 ready

* Store variable

* Renames var
 2024-07-22 09:32:48 +00:00
dj-34
d51c3cf478 Fix inventory hands clickable areas & confusing overlay (#26212) 
* Remove confusing hand overlay

Co-Authored-By: Serge K Lebedev <hello@sergelebe.dev>

* Fix clickable areas of equipped items

Co-Authored-By: Serge K Lebedev <hello@sergelebe.dev>

---------

Co-authored-by: Serge K Lebedev <hello@sergelebe.dev>
 2024-07-22 07:43:05 +00:00
DGamerL
6c0163747c Makes NODROP mops not get stuck in mop buckets (#26250) 
* Cleans up the proc

* Update code/game/objects/structures/mop_bucket.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Faron review

* Proc refactor

* CI fixes

* Unnecessary check

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-20 16:27:53 +00:00
Luc
cb4d709c78 Fixes some extraneous spacing in some messages (#26222) 
* clears a bunch of spaces

* oopsie daisy

* Update code/modules/food_and_drinks/food/customizables.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-07-20 00:15:21 +00:00
1080pCat
e32843e544 Fixes rigged batons runtiming on hit. and also fixes syringes (#26223) 2024-07-15 22:00:43 +00:00
DGamerL
e2e6dd50c3 Oops (#26204) 2024-07-11 03:33:15 +00:00
CRUNCH
e3d67c4f7d Miscellaneous Code Tidying (#26180) 
* Update items.dm

* Update welder.dm

* Update energy_melee_weapons.dm

* Update items.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
 2024-07-10 03:34:49 +00:00
BiancaWilkson
ec88636e6c Cyborg Damage, Movement, and Power Overhaul (#25252) 
* Adding defines

* More signals for external power

* Gets the reboot working

* renaming a proc

* config stuff

* Working on cyborg movement

* Update code/modules/mob/living/silicon/robot/robot_damage.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/modules/mob/living/silicon/robot/robot_damage.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/modules/mob/living/silicon/robot/robot_damage.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* IOSYS where'd you come from

* begon return 0

* VTEC caps slowdown

* Adjusting EMPs

* Funny arm is GONE

* Oh yeah regenerating stamina might be a good thing

* Forgot you could uninstall vtec

* icon machine broke

* Cell-less borgs can enter chargers to stay powered

* oh that was almost bad

* Fixes some logic

* its a surprise tool that will help us later

* Adjusting some numbers

* Adds a sound to go along with the text alarm

* dead things can still charge

* Another logic error

* Xenos too

* sorry linter

* fixes CL

* Slightly more slowdown on stam damage

* neurotoxin won't stun

* SOUNDS!

* 3 flashes to stun instead of 4

* Slightly longer stun

* SPEEDING UP BORGS JUST FOR THE TM SINCE CONFIG DONT WORK

* Keep borgs stunned forever

* Power loss is more dangerous

* Adds a stamina hud to borgs

* Cyborgs now heal up properly

* Removes an outdated comment

* Replacing parts works better now

* EMPs disable components for a brief time

* More missed rebalances

* When you forget to remove debug messages

* WHAT

* Cult magic works + borgs can be silenced

* 2 flashes to stun, flashes confuse now

* Update code/game/objects/items/devices/flash.dm

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

* Abductors can stun borgs

* Watcher/cyro rays deal stam to brog

* Fixes a rounding error when healing borgs back to full HP

* Fixed span

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>

* Fixed whitespace

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>

* Guard clausify

* Indents a message

* Update code/modules/mob/living/silicon/robot/robot_damage.dm

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

* Update code/modules/mob/living/silicon/robot/component.dm

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

* Update code/modules/mob/living/silicon/robot/robot_damage.dm

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

* that's not what stat does

* No more hardcoded speed, don't TM this branch

---------

Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2024-07-09 17:44:50 +00:00
Qwertytoforty
cd88b3de88 [s] Stunbaton no longer triggers shields twice (#26197) 
* [s] stunbaton no longer triggers shields twice

* renamed
 2024-07-09 15:08:16 +00:00
DGamerL
4cf6595d12 Makes all playsounds use bools for vary (#26183) 
* Makes all playsounds use `TRUE` for vary

* Same but for `FALSE`
 2024-07-08 23:54:38 +00:00
warriorstar-orion
62dc3d57dd cleanup: Remove all unused accesses. (#26146) 
* cleanup: Remove all unused accesses.

* Whoops, TCOMSAT is used, didn't read script correctly
 2024-07-08 13:12:46 +00:00
DGamerL
9a37b7104b Knuckledusters now change hitsound again (#26177) 2024-07-08 13:09:16 +00:00
DGamerL
e5915846fa Changes energy sword sharpening to use signals (#26157) 
* We love signals in this household

* This isn't needed

* Coconut review

* Update code/game/objects/items/weapons/melee/energy_melee_weapons.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Adds handler

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-07-08 13:03:32 +00:00
DGamerL
09a4ed795c Various rollie fixes (#26163) 
* Various rollie fixes

* Fixes
 2024-07-08 12:54:20 +00:00
CRUNCH
7a3daae2b1 Update bio_chip_supercharge.dm (#26173) 2024-07-07 22:13:07 +00:00
1080pCat
4a7472495e Removes the 1s option from flashbangs (#26079) 
* flashbang 1s gone

* time defines

* Update code/game/objects/items/weapons/grenades/flashbang.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

* Update code/game/objects/items/weapons/grenades/flashbang.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

---------

Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-07-07 13:16:46 +00:00
Spaghetti-bit
8cfdc72b31 fix: Cleans up lighter code a tiny bit and fixes colored lighters becoming green (#26129) 
* Cleans up lighter code a tiny bit and fixes colored lighters becoming green.

* Applies a multitude of suggestions, cleans up code.

* Slims down the code and fixes the zippo.

* Axes `var/base_item_state`

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* Applies suggestions from @DGamerL

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-07-05 16:59:16 +00:00
DGamerL
395804afbd You can cmag grenades to boomerang back to you (#25920) 
* Haha bomberang

* cmag act now

* Reverts inital commit

* Grenade instead of syndieminibomb

* Adds uncmagging
 2024-07-04 23:02:17 +00:00
DGamerL
1a3a77d42c Replaces the projectile deflect from the titanium push broom with a good parry (#26061) 
* No more reflect, good parry instead

* Remove this too
 2024-07-03 03:50:03 +00:00
McRamon
cc8aa14e9f Greyman Henley - Alternative to tacticool (and Dexter reference) (#26031) 
* sprites for test

* fixic

* species

* icon state

* fixies

* loadout and vendor

* palette update

* color update
 2024-07-03 03:47:01 +00:00
Adrer
6738775be2 [FIX] You can now throw chem grenades (And some other things) further than 1 tile again (#26105) 
* Fix throwing for a couple of items

* Not watertanks

* Or backtank fire extinguishers

---------

Co-authored-by: Adrer <adrermail@gmail.com>
 2024-07-01 23:07:26 +00:00
Luc
77253c5ae7 Gives Surgical Drapes a Use (#25686) 
* Gives drapes some utility for starting surgeries

* Adds a nice helping of drapes throughout the codebase

* add icon, realize I didn't think that through

* Handles blood with signals

* whoopsie daisy

* range

* how about borgs

* Apply suggestions from code review

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

* burza suggestion

* more dgamer reviews

* Oops

* Update code/modules/surgery/surgery.dm

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

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-01 19:01:17 +00:00
CRUNCH
ce5f820181 Adds the Research & Development Crate - For Continuing Science After the End of the World (#25990) 
* Update pack_science.dm

* BOX
 2024-07-01 18:55:47 +00:00
Gaxeer
32e46c02aa refactor: rename action button appearance related variables and procs to be clearer (#25658) 
* refactor: make action appearance creation more straightforward

* some adjustments

* fix: adjust action icons to refactor
 2024-07-01 02:29:31 +00:00
Faron
340d8a3731 Update to restraints (#25831) 
* Update carbon_procs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update items.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update handcuffs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update humanoid.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update human_mob.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update status_effects.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update neutral.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update blood_magic.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update abduction_gear.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update items.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update abduction_gear.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/game/objects/items.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/game/gamemodes/cult/blood_magic.dm

Woops.

Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update items.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update handcuffs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update handcuffs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update handcuffs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update handcuffs.dm

The consequences of my actions

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update humanoid.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update carbon_procs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update clothing.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update human_mob.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

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

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update carbon_procs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update handcuffs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

---------

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-07-01 02:14:52 +00:00
DGamerL
1b56455861 Lowers grenade throwspeed (#25921) 2024-06-29 18:15:17 +00:00
Pedro
68635765b2 Adds a healthhud and securityhud to Captain's garment and crew monitor to Blueshield's locker. (#25982) 2024-06-29 18:00:25 +00:00
Taurtura
1e1b711be5 More medkits ! With the correct branch this time! (#25985) 
* tactical medkit craft

* machine and aquatic kit from plastic

* adds fake tactical kit

* change recipe to make the fake tactical kit
 2024-06-29 17:59:35 +00:00
DGamerL
c12d0346a1 aaaaaa (#26080) 2024-06-29 01:59:20 +00:00
Luc
bfb9e8c132 Refactors Foam (#25436) 
* foam starts

* foam fixes

* foam foam foam

* remove widefoam, get cleaning grenades working as they should

* sirryan reeview

* Apply suggestions from code review

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

* Apply suggestions from code review

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

* locs good to me

* dgamer review

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-28 20:39:26 +00:00
chuga-git
43b7fa5ed9 Gargantua Blood Rush now removes bolas (#25989) 
* gargantua bloodrush now clears legcuffs, slightly refactors removing restraints

* comment tweaks, prevents blood rush from being used when buckled.

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com>

---------

Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-06-28 03:16:55 +00:00
CRUNCH
bb2e96792b Tweaks the Light Replacer (#25932) 
* Light Replacer Enhancement

* Update code/game/objects/items/devices/lightreplacer.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update

* Update lightreplacer.dm

* Update lightreplacer.dm

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-28 03:16:37 +00:00
CRUNCH
62a7d79358 Update cigs.dm (#25842) 2024-06-28 03:16:32 +00:00
CRUNCH
ee6879ad7b Replaces the Nicotine in Rollies With Weed (#25840) 
* Update cigs.dm

* Update cigs.dm
 2024-06-28 03:15:33 +00:00
PollardTheDragon
48f429e307 Added smoketime calc to adding reagents (#25933) 
* Added smoketime calc to adding reagents

* Math fix

* Spacing

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Improved calculation

* SIMPLIFICATION MATH

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-28 03:08:46 +00:00
DGamerL
a3af356e55 New bag sprites by Alexios! (#25810) 
* New bag sprites!

* New biobag sprite
 2024-06-28 02:05:04 +00:00
HMBGERDO
936d19c0a0 Blood spread fixes and tweaks (#26048) 
* blood spread fixes and tweaks

* just to make sure

* soap cant be bloodied, better check on gloves
 2024-06-26 20:57:30 +00:00
DGamerL
ed7782ad4c Adds the oneuse autosurgeon (#25978) 2024-06-26 20:38:53 +00:00
Spaghetti-bit
457f9ff04f [TWEAK] Bio-Chip Pad Renaming Tracker Bio-Cips (#25617) 
* Allows the biochip pad to change the GPS tag on the tracker implant. No more standard 'TRACK0' on everything.

Updates the UI for the biochip pad.
Adds the biochip pad to the protolathe under the medical tab

* Prettier!!! :)

* Moves the "tag" property below the general blurbs.

* Update code/game/objects/items/weapons/bio_chips/bio_chip_pad.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>

* Merge Conflict Fix (1/2)

* MC (1.5/2)

* Merge Conflict Resolution (Hopefully)

---------

Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-06-25 21:29:45 +00:00
Faron
ef3162121a Fixes clones being stuck mindslaved (#25981) 
* Update clonepod.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update clonepod.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update bio_chip_traitor.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update datum_mindslave.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update datum_mindslave.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Create misc_mindslave.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update paradise.dme

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

---------

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>
 2024-06-25 10:34:22 +00:00
Qwertytoforty
e7adf789e1 bluespace spellblade and modsuit teleporter module work better (#25900) 
* bluespace spellblade and modsuit teleporter module work better

* nah this should stay 7

* 7 ate 9
 2024-06-22 23:16:01 +00:00
Spaghetti-bit
f0cef57c17 Nian Caterpillar Infestation and Worme Invasion (#25560) 
* I hate DMI merge conflicts.

* Attempt at full merge conflict resolution

* Ticked >:C

* Moves the include because

* Fixes missing proc.

* 🫃

* Readds the worme cubes to all places the other bunches are. As well as changes the xenobiology console to spit out the type of monkey/primitive form that the monkey recycler is set to.

* Adds changes requested by DGamerL

* Replaces space indents with tabs. Error caused by copy pasting.

* Update code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>

* Uniforms the tab spacing.

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>

* Adds requested changes from @lewcc

* Removes so missed #undef in `monkey.dm`

---------

Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-22 18:20:27 +00:00
Qwertytoforty
c7d6e83d7e fixes block uptime being 33% instead of 50% (#25917) 
* matt I'm shooting you (not really but)

* also these ones

* fixes cqc
 2024-06-20 11:38:30 +00:00
Contrabang
18b0b09778 adds spawners for NPC zombies (#25873) 
* lmao

* lol

* yes

* yeah sure

* fix

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* lewc review + duplicate

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-06-20 11:38:23 +00:00
Contrabang
2a0d1c0416 ognerwogner[0ign3we0ifnhwepighn3igbwoigbewo (#25902) 2024-06-14 19:02:44 +00:00
CRUNCH
b297a543df Serving Tray Tweakery (#25759) 
* Update bags.dm

* Update bags.dm

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update bags.dm

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update bags.dm

* Update bags.dm

* Update bags.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-06-12 22:07:26 +00:00
CRUNCH
9ea4320f46 Update fancy.dm (#25721) 2024-06-12 19:18:02 +00:00