Commit Graph

18743 Commits

Author SHA1 Message Date
Rykka
6e3d0f7238 Removes pain on defib for everyone, and removes xenochimera lick wounds
Pending re-addition later for Xenochimera-specific implementation.
2022-03-27 18:59:22 -06:00
Rykka
d4fb27da6f Xenochimera QOL PR
Adds Regenerating + Hatch thrown alerts, similar to stunned/weakened/buckled, and clicking will show the remaining time to revive, or allow you to hatch.
Defibrillators will now apply halloss to Xenochimera and set them feral on revive.
Defibrillators will now apply halloss (pain) to everyone on revive.
Medscanners will now display if a Xenochimera is regenerating or needs more protein, and if a 'chimera is dead, will warn that they require sedation.
Reconstitution cooldown reduced from 1 hour to 10 minutes.
Regeneration will no longer handle ferality in the middle of it, preventing edge-case *twitches while clearly regenerating.
Regeneration will now have an audible + visible cue that plays on a 2% chance.
Xenochimera have gained the Lick Wounds Verb.
Lick Wounds has been modified to allow treating self-injuries, and injuries of the mob next to you. Given how limited the use is and how often bandages + chems are just flat-out better, this shouldn't be a huge balance issue, IMO.
2022-03-27 16:22:46 -06:00
Casey
8182a57fea Merge pull request #12545 from BonniePandora/unfucks-engraving
Makes engraving no-longer cause rage when trying to cut wires, amongst other things.
2022-03-27 14:59:24 -04:00
Heroman
56849e7a71 Reworks xenobio extract rewards 2022-03-27 14:17:41 +10:00
Pandora
bb60734833 Update knives.dm 2022-03-26 16:52:16 +00:00
Pandora
ddd3137592 Update wirecutters.dm 2022-03-26 16:51:40 +00:00
Pandora
3b04c3893f Update screwdriver.dm 2022-03-26 16:47:26 +00:00
Pandora
fea7d8c037 Update wall_attacks.dm 2022-03-26 16:46:32 +00:00
Pandora
7d3173d539 Update floor_attackby.dm 2022-03-26 16:44:17 +00:00
Casey
69be3b4d64 Merge pull request #12541 from GhostActual/Firearms1
Did a Whoops
2022-03-26 00:42:55 -04:00
GhostActual
ab79b72200 Did a Whoops 2022-03-26 00:30:28 -04:00
Casey
cce944d043 Merge pull request #12522 from GhostActual/Firearms1
Firearms 1
2022-03-25 23:55:54 -04:00
Casey
1dad102bf4 Merge pull request #12539 from FartMaster69420/slip-nom
Slip Vore
2022-03-25 23:18:42 -04:00
FartMaster69420
76b3645370 Adding sanity
Adds a short timer after being expelled from a belly, during this time frame you cannot be slip nom'd.
2022-03-25 22:50:11 -04:00
FartMaster69420
f79768c837 Initial Commit 2022-03-25 13:46:21 -04:00
GhostActual
7dced2cc17 Base Commit 2022-03-24 16:35:34 -04:00
Eli Atonis
9ec106f06f Allowing micros to crawl into storage items
Fixed a bug where a micro player could pick themselves up out of storage items if they used alt+click to open it. This would free them, but create an invisible, empty holder item in their hands which could then be placed in storages.

Added the ability for micros (size 25%) and observer mice (size 100% or lower) to drag their sprite over storage items in order to climb inside. Same as if a player were to pick them up and store them.
2022-03-24 19:31:07 +11:00
VerySoft
80ab673771 Admin Verbs
Adjusts Intercom Msg a little

Adds Orbit Things verb, which allows staff to more easily orbit things around other things.
2022-03-23 01:36:04 -04:00
GhostActual
d4f6914140 Base Commit 2022-03-21 15:38:31 -04:00
Casey
51f1481f60 Merge pull request #12502 from Very-Soft/assistant
Assistant alt title for Intern
2022-03-21 06:25:16 -04:00
VerySoft
73d6ac1414 Assistant alt title for Intern
Assistant was renamed as a job to attempt to get away from the general SS13isms that come with the default position.

I think though that, as a title, it fits very well with Intern, especially considering it isn't the default role, or the default title for that role. 

Basically, it's what I'd use for playing intern, since when I'm playing intern I'm generally hopping on to be a helper who doesn't necessarily have responsibilities unless I volunteer for them.

And if that doesn't sound like 'someone who assists', I don't know what does. SO! (I thought about doing '[department] assistant' for all the different departments except command (since Command Assistant already exists as an alt title) but I sort of thought better of it.
2022-03-21 06:05:13 -04:00
GhostActual
96d2da15a3 Base Commit
Update shotgun.dm

Final Commit?

Final
2022-03-21 05:02:08 -04:00
Atermonera
f01d1afa72 Merge pull request #8432 from listerla/typos
somethign -> something
2022-03-20 15:09:39 -04:00
GhostActual
3c10cc1aee Base Commit 2022-03-20 00:03:01 -04:00
GhostActual
25f3367a3c Adds the two extra guns back to the sidearm box 2022-03-18 23:50:01 -04:00
GhostActual
47b9f404f6 Base Commit
Whoops

Not supposed to be here

Idea I had in the middle of the night that wanted to add
2022-03-18 23:50:00 -04:00
Casey
8ee0c8c873 Merge pull request #12449 from BonniePandora/Warden's-delight
Adds a choice between shotguns available to wardens.
2022-03-18 15:33:54 -04:00
Pandora
ddf216335c You know why? 2022-03-17 21:12:00 +00:00
Pandora
fc00497706 oopsy doopsy 2022-03-16 16:40:06 +00:00
Pandora
fe40352cec I wasn't really planning on landing it 2022-03-13 07:47:35 +00:00
Casey
2427db9b84 Merge pull request #12420 from FartMaster69420/borg-upgrades
More Upgrade Modules for Borgs
2022-03-12 15:44:14 -05:00
Verkister
18a3780e74 Fixes zaddat lunchbox adding extra hypos on all SB
Fixes zaddat survival lunchbox adding extra glucose hypos on all survival lunchboxes, or more specifically just overriding the loadout survival lunchbox.
2022-03-12 12:12:32 +02:00
FartMaster69420
c4d09997f7 Printable modules
Making the modules printable
2022-03-11 20:39:56 -05:00
FartMaster69420
f139c8369d Update robot_upgrades.dm 2022-03-11 17:26:37 -05:00
FartMaster69420
c195eba49a Update robot_upgrades.dm 2022-03-11 16:29:32 -05:00
FartMaster69420
35bded46c2 Merge branch 'VOREStation:master' into borg-upgrades 2022-03-11 16:23:30 -05:00
VerySoft
bc17a8bf81 That was almost really stupid 2022-03-09 16:40:10 -05:00
VerySoft
83d40e1f56 Don't announce dominated brains when leaving
They're part of your brain it's fine.
2022-03-09 16:36:49 -05:00
Casey
a85cd666a6 Merge pull request #12392 from Heroman3003/cookiefix
Brings REAL cookies to everywhere they belong
2022-03-07 04:05:16 -05:00
Heroman
fbb0a65231 Brings REAL cookies to everywhere they belong 2022-03-07 18:44:53 +10:00
Pandora
a9a959ab89 The locker room's two blocks down 2022-03-06 16:26:38 +00:00
Pandora
ead95082d3 Atmos Tech QoL 2022-03-06 06:00:36 +00:00
FartMaster69420
c3d2a3591f Borg Stuff 2022-03-05 12:22:03 -05:00
Casey
27b451a2c8 Merge pull request #12353 from GhostActual/Ammo_Boxes
Ammo Boxes
2022-03-03 16:22:34 -05:00
VerySoft
2153a45288 Change painting persist decay
Instead of paintings lasting 1000 shifts before being deleted

Now the system will store up to 1000 paintings, and remove the one at the top of the list (the earliest/oldest one) first when the maximum number of paintings is exceeded. 

Additionally, examining a painting that has been stored will move it to the bottom of the list, effectively renewing its lease in the system. 

This should make it so that paintings aren't just arbitrarily being removed for being old, and, the paintings that actually get looked at should stick around.
2022-03-01 20:50:05 -05:00
klaasjared
e4ed93e11d Shotgun Ammo Boxes
Replaces all ammo boxes with new ammo box type (Alt-Click to remove shells) - put in separate Commit in case Admins don't want this

(Compile Fixes)
2022-03-01 01:27:54 -05:00
klaasjared
dc2bc419c1 Secondary Commit 2022-02-28 22:17:03 -05:00
Casey
4b581b9aa5 Merge pull request #12333 from VOREStation/upstream-merge-8356
[MIRROR] Fixes non-growing spiderlings growing.
2022-02-27 15:08:15 -05:00
Casey
339b501b10 Merge pull request #12321 from TheDavestDave/saber
A more elegant weapon from a more civlised age
2022-02-27 14:27:10 -05:00
Atermonera
8bf40bf593 Merge pull request #8356 from Verkister/patch-82
Fixes non-growing spiderlings growing.
2022-02-26 14:08:49 -05:00