dzahlus
f206213603
60 second cooldown instead of 3 minutes
2021-03-01 22:16:23 +01:00
dzahlus
12c7e22c28
ugh lavaland
2021-02-26 15:57:27 +01: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
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
DeltaFire
60708b03df
check
2021-02-24 05:16:15 +01: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
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
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
silicons
1585afa1ef
Update jacqueen.dm
2021-02-20 20:55:31 -07:00
timothyteakettle
69e9a94829
prioritise clients
2021-02-21 00:18:25 +00:00
Adelphon
f795d007a9
bugfix
2021-02-20 18:18:27 -05:00
Putnam
a26f850f1c
don't push before thinking, kids
2021-02-20 07:41:37 -08:00
Putnam
d6350b2e75
undergarment logging too
2021-02-20 07:41:11 -08:00
Putnam
c24c339718
Fixed a runtime might cause issues.
...
This might also break logging completely, which, why. This isn't a high-priority log, though, so.
2021-02-20 07:36:46 -08:00
silicons
293404f728
Merge pull request #14258 from IronEleven/IronEleven-patch-1
...
Raises Space Vine Population Requirement
2021-02-20 03:02:24 -07:00
silicons
ecad553fe2
Merge pull request #14263 from Hatterhat/metabreak-b-gon
...
the one where i make anomaly announcements and brand intelligence always announce
2021-02-20 03:02:06 -07:00
silicons
e36794d0f5
Merge pull request #14271 from shellspeed1/revert-14248-trying-to-make-floor-bots-actually-do-a-decent-job-of-repairs
...
Revert "Fix for floorbots not placing a plate before placing a floor."
2021-02-20 02:59:16 -07:00
silicons
7fdcacdf19
Merge pull request #14272 from MrJWhit/random-port
...
Port of "removes unnecessary %"
2021-02-20 02:58:19 -07:00
silicons
cabc471d92
Merge pull request #14273 from timothyteakettle/chaplain-vampire
...
chaplain vampires won't burn in their own chapel now
2021-02-20 02:58:06 -07:00
Timothy Teakettle
7c00a9723d
Revert "test"
...
This reverts commit 7b8b16dc22
2021-02-19 23:09:57 +00:00
Timothy Teakettle
7b8b16dc22
test
2021-02-19 22:19:00 +00:00
silicons
030f8ad681
Merge pull request #14261 from SmArtKar/tcg_qol
...
[READY] Small QoL changes to TCG
2021-02-19 13:37:10 -07:00
Timothy Teakettle
9528cc9ce4
woops i left that in
2021-02-19 19:36:19 +00:00
Timothy Teakettle
94ad05b2bc
better idea
2021-02-19 17:14:36 +00:00
Timothy Teakettle
9de5e5f5fa
Update vampire.dm
2021-02-19 17:07:41 +00:00
MrJWhit
ea47ab1610
Update seed_extractor.dm
2021-02-19 10:00:43 -05:00
shellspeed1
f17be50d5f
Revert "Fix for floorbots not placing a plate before placing a floor."
2021-02-18 23:28:10 -08:00
Putnam
257cd6bb34
keyword argument funnies, whoops comma
2021-02-18 21:55:28 -08:00
Lin
d2f9237ecd
Merge pull request #14237 from Citadel-Station-13/silicons-patch-11
...
adds sanity checks to heretic blade shatters
2021-02-18 23:51:23 -06:00
Putnam
990df7df37
added exposure logging
2021-02-18 21:36:54 -08:00
Lin
1acd81c036
Merge pull request #14246 from TyrianTyrell/master
...
Multilingual conditions fix.
2021-02-18 23:36:20 -06:00
Lin
0e01f2826b
Merge pull request #14251 from Chiirno/SynthHuskTweak
...
Massive synthflesh buff
2021-02-18 23:34:53 -06:00
Lin
dbcc95ea28
Merge pull request #14262 from timothyteakettle/lawyer-message-all-href
...
stops people using Message All on PDAs when their cartridge doesn't allow it
2021-02-18 23:34:11 -06:00
Putnam
c84dba85dd
should also log climaxes (all of them)
2021-02-18 21:31:25 -08:00
Putnam
ecc1ff26bb
Slightly more logging, whoops added pref
2021-02-18 21:27:59 -08:00
Putnam
cbac292731
Adds back aphro, nympho
2021-02-18 21:22:43 -08:00
Timothy Teakettle
746ca01823
Update code/game/objects/items/devices/PDA/PDA.dm
...
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
2021-02-19 02:10:03 +00:00
silicons
98d23bb87b
Merge pull request #14256 from Adelphon/ppantsg
...
Polychromic Pants & Jacket
2021-02-18 17:41:51 -07:00
