Commit Graph

18766 Commits

Author SHA1 Message Date
Casey
9a12d58405 Merge pull request #12636 from GhostActual/aurora-port-1
Hypospray Revamp
2022-04-04 16:01:53 -04:00
GhostActual
937e8303f3 Base Commit 2022-04-04 15:43:46 -04:00
VerySoft
99a2df9dee Various fixes and more GB tweaks 2022-04-04 14:55:58 -04:00
VerySoft
b31ee089ac GB Update
New stuff!
2022-04-04 13:38:08 -04:00
Casey
5d24d5b2c3 Merge pull request #12631 from GhostActual/aurora-port-1
Mini Aurora Port
2022-04-04 04:40:50 -04:00
VerySoft
40379d01d8 I did it 2022-04-04 03:36:08 -04:00
GhostActual
fac05cdd40 Base Commit 2022-04-04 02:10:25 -04:00
VerySoft
9230920ffe Wow! 2022-04-03 03:39:06 -04:00
Casey
b9473ccb94 Merge pull request #12592 from GhostActual/tg-port-6
The Grand /TG Port - Part 6
2022-04-02 23:31:31 -04:00
Casey
5d9f0462c1 Merge pull request #12579 from GhostActual/tg-port-5
The Grand /TG Port - Part 5
2022-04-02 23:30:27 -04:00
Casey
73589bb510 Merge pull request #12578 from GhostActual/tg-port-4
The Grand /TG Port - Part 4
2022-04-02 23:28:42 -04:00
Casey
561f6e3571 Merge pull request #12577 from GhostActual/tg-port-3
The Grand /TG Port - Part 3
2022-04-02 23:27:40 -04:00
Casey
086173c328 Merge pull request #12576 from GhostActual/tg-port-2
The Grand /TG Port - Part 2
2022-04-02 23:26:31 -04:00
GhostActual
81c603f9d5 Base Commit 2022-04-02 22:54:14 -04:00
GhostActual
3d57004141 Base Commit 2022-04-01 13:45:16 -04:00
GhostActual
801533a69f Revert "Base Commit"
This reverts commit 1de45df2ba.
2022-04-01 13:39:44 -04:00
GhostActual
1de45df2ba Base Commit 2022-04-01 13:33:51 -04:00
GhostActual
ef2ef019cb Base Commit 2022-04-01 03:33:58 -04:00
GhostActual
59c9199ace Base Commit 2022-04-01 02:42:14 -04:00
GhostActual
d97ffa3c16 Base Commit 2022-04-01 02:04:21 -04:00
GhostActual
b268b7bcfa Base Commit 2022-04-01 01:03:30 -04:00
VerySoft
814b2188c1 Going to slep 2022-03-31 09:02:22 -04:00
VerySoft
2076e9769a This too come on now 2022-03-29 05:53:10 -04:00
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