Commit Graph

27215 Commits

Author SHA1 Message Date
MarinaGryphon
cc0f79f772 Fixes #14341 2021-02-28 19:05:10 -06:00
silicons
e36f148014 Merge pull request #14293 from SmArtKar/tcg_gaming
[READY] TCG fixes
2021-02-28 01:26:56 -07:00
Lin
ec2ca7985d Merge pull request #14311 from SandPoot/body-rejuv-buff
Body rejuvenation automatically repeats until completely healed
2021-02-27 17:13:16 -06:00
Lin
d645785fc9 Merge pull request #14315 from Citadel-Station-13/silicons-patch-21
fixes instrument min sustain being too low for exponential dropoff to work
2021-02-27 17:12:09 -06:00
Lin
8d840e58f9 Merge pull request #14304 from Citadel-Station-13/test
adds clown mentality to trait modifications for datum/mind and makes me lose my mind slightly less
2021-02-27 14:46:56 -06:00
Lin
41f227bc5e Merge pull request #14321 from Putnam3145/windbreaker-fix
Makes polychromic windbreaker's message not be nonsense
2021-02-27 14:43:35 -06:00
Lin
4cd12649d2 Merge pull request #14325 from dzahlus/slime-fix
Fixes toxin healing for slimes in heretic related stuff
2021-02-27 14:41:33 -06:00
R3dtail
af4b8ef0c5 Update vorepanel.dm
Made it uniform with the maximum characters allowed for emotes because uniformity is nice.
2021-02-26 19:36:44 -06:00
R3dtail
9ea578987f Bigger Belly
Doubles the number of characters available to be used for bellies_desc_max.  Additionally, doubles the number of characters available for the bellies_name_max.
2021-02-26 15:03:32 -06:00
Lin
969487c44e Merge pull request #14316 from Putnam3145/tablet-rad-fix
Makes tablets not permacontam.
2021-02-26 14:41:43 -06:00
silicons
318f9f5a3d Merge pull request #14289 from TheObserver-sys/BotanyPassII
Botany Pass II: How the hell did it take me this long to notice that these things aren't functioning????
2021-02-26 13:38:56 -07:00
silicons
6c3be09e97 Merge pull request #14300 from keronshb/sentientbuff
Allows Sentient Disease to purchase most abilities from the start.
2021-02-26 13:36:27 -07:00
silicons
8792ea756a Merge pull request #14302 from R3dtail/patch-2
Enables Novel Posting
2021-02-26 13:36:22 -07:00
silicons
9e6fb3a310 Merge pull request #14281 from kiwedespars/undo-what-has-been-done
parrying nerf/pugilism buff
2021-02-26 13:36:09 -07:00
silicons
0939e31982 Merge pull request #14283 from Hatterhat/patch-1
buhhh lingfist nerf 3am webedit
2021-02-26 13:36:01 -07:00
silicons
bf38aa73ff Merge pull request #14285 from kappa-sama/patch-46
makes tcg cards and binders small and thus easier to store for persistence
2021-02-26 13:35:02 -07:00
dzahlus
51595705e4 simpin for slimes 2021-02-26 20:59:28 +01:00
SandPoot
08d19e349f Update code/modules/surgery/advanced/toxichealing.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-02-26 10:06:53 -03:00
Putnam
ac0fd530f2 Makes polychromic windbreaker's message not be nonsense 2021-02-26 00:13:23 -08:00
Lin
ecc61689f8 Merge pull request #14305 from Citadel-Station-13/silicons-patch-18
sam dennison you exploit hoarding banana i will shove a barrel of ghost peppers down your throat for this crime
2021-02-25 20:35:08 -06:00
Lin
bc8b253837 Merge pull request #14303 from DeltaFire15/wiring-skillgain
Adds state check callbacks to machine frame tool use
2021-02-25 18:03:00 -06:00
Putnam
bf6c574ea4 Makes tablets not permacontam. 2021-02-25 05:55:44 -08:00
silicons
c816fcb672 Update instruments.dm 2021-02-25 05:11:47 -07:00
SandPoot
ccc50ff9ce upload toxichealing.dm 2021-02-24 20:47:46 -03:00
R3dtail
aca2f89687 Update say.dm
Deleted the comment on line 90 since max_message_len and max_flavor_len  are now equal as it was a requested change
2021-02-24 17:20:21 -06:00
Putnam3145
2156a1566d Merge pull request #14294 from DeltaFire15/maroon-broke
Once again fixes objective generation
2021-02-24 03:37:24 -08:00
silicons
504a36f50d Update holy_weapons.dm 2021-02-24 01:36:03 -07:00
silicons
fd497b3297 Update traits.dm 2021-02-24 01:23:06 -07:00
silicons
94cc70f7b9 Update traits.dm 2021-02-24 01:21:00 -07:00
DeltaFire
60708b03df check 2021-02-24 05:16:15 +01:00
R3dtail
8400a664e8 Enables Novel Posting 2021-02-23 22:00:49 -06:00
kappa-sama
a55d492d9d reading moment 2021-02-23 18:58:18 -05:00
keronshb
04764600bb Unlocks Sentient disease abilities
Let's the Sentient Disease start with stuff to unlock.
2021-02-23 16:25:18 -05:00
SandPoot
6c5acc3b4d upload files 2021-02-23 16:42:07 -03:00
DeltaFire
b214d70383 Merge pull request #14268 from Citadel-Station-13/silicons-patch-16
alternatively, replaces the cube sentinel spawn with an actual simplemob sentinel that drops a carbon sentinel body on death so you still get to run this to the ground without being able to be a literal alien queen
2021-02-23 13:01:27 +01:00
DeltaFire
cc8c75539e sigh 2021-02-23 12:50:33 +01:00
SmArtKar
e925aea454 Fixes 2021-02-23 12:44:11 +03:00
silicons
178fe9cf55 Merge pull request #14253 from keronshb/eutactic_blade_restoration
Hyperblade restored to uplink
2021-02-22 13:10:21 -07:00
keronshb
eb3299e969 Removes Dragon Tooth
Why bother
2021-02-22 13:54:53 -05:00
Lin
150689c84a Merge pull request #14282 from Citadel-Station-13/silicons-patch-17
>put "spawn a new copy of this" in the garbage collection logic of a mob >that seems like it'll cause problems, huh.
2021-02-22 11:18:12 -06:00
Timothy Teakettle
5c2f5cf8a7 Update charter.dm 2021-02-22 17:07:10 +00:00
silicons
61061dc25a Merge pull request #14280 from timothyteakettle/banning-panel-fix
prioritises mobs with clients in the banning panel
2021-02-21 19:04:53 -07:00
kappa-sama
81fdb96968 small moment 2021-02-21 17:50:23 -05:00
silicons
f581d8c8e0 Merge pull request #14264 from dzahlus/pain-emote-updates
Pain emote is now added to getting wounded! As well as more pain sounds
2021-02-21 14:56:26 -07:00
silicons
4ba9df18de Merge pull request #14279 from Adelphon/boon
bugfix
2021-02-21 14:53:39 -07:00
silicons
f1392307d9 Merge pull request #14235 from Vynzill/junglechanges
Jungle gateway nerf and touch ups: ape edition
2021-02-21 14:52:57 -07:00
silicons
ae63422727 Merge pull request #14269 from Putnam3145/aphro-readd
More arousal logging; adds back aphro/nympho
2021-02-21 14:50:32 -07:00
silicons
841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing
Tool behavior replacing
2021-02-21 14:48:50 -07:00
Hatterhat
1eb2d3dd93 buhhh lingfist nerf 2021-02-21 02:58:19 -06:00
silicons
1585afa1ef Update jacqueen.dm 2021-02-20 20:55:31 -07:00