Commit Graph

18815 Commits

Author SHA1 Message Date
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
dzahlus
12c7e22c28 ugh lavaland 2021-02-26 15:57:27 +01:00
dzahlus
71cbd8a615 no more free esword 2021-02-26 14:40:00 +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
Putnam
b2388c0f08 Removes auto-matchmaking from valentines event 2021-02-25 23:11:40 -08:00
silicons
50f7d89367 whew 2021-02-25 23:29:23 -07:00
silicons
37eaebe54a fix 2021-02-25 23:22:46 -07:00
Putnam
bf6c574ea4 Makes tablets not permacontam. 2021-02-25 05:55:44 -08:00
SandPoot
ccc50ff9ce upload toxichealing.dm 2021-02-24 20:47:46 -03:00
Hatterhat
24407b9768 time to set this up as a reminder 2021-02-24 14:58:57 -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
Putnam
526105ffd6 Made it not announce 100% of the time 2021-02-24 03:35:30 -08:00
Putnam
04b5ee0b16 Adds a new event: "supermatter surge" 2021-02-24 03:29:19 -08:00
Putnam
23eaf250a9 Make sure to hit the funny tick 2021-02-24 03:12:01 -08:00
Putnam
311d766bd5 Adds a supernova event, with tweaks to allow this 2021-02-24 02:56:14 -08: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
Putnam
5d17b9bfea Removes open-air fusion completely. 2021-02-23 04:36:59 -08: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
Letter N
5c39381117 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-23 11:36:05 +08:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08: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
SandPoot
eb4fcd8a00 for some reason A doesn't have istype? what. 2021-02-22 13:51:49 -03:00
SandPoot
19efaba061 upload hivelord.dm 2021-02-22 13:37:49 -03:00
SandPoot
d9e966234a upload hivelord.dm 2021-02-22 13:36:06 -03:00
Letter N
2be4c76add THIS FIXES IT (well it should :) ) 2021-02-22 21:05:07 +08: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
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
Letter N
7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08:00
Letter N
0bb5ec3316 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-21 09:55:36 +08:00
kiwedespars
6a694841aa i forgot this thing
microstagger is now a stagger
2021-02-20 17:46:06 -08:00
kiwedespars
15a8d1d5e0 i did a thing
- reverted salt nerf
- made it so you can't parry while resting
2021-02-20 17:24:30 -08: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