Commit Graph

6091 Commits

Author SHA1 Message Date
Heretical Lizard 9787c02258 Update code/modules/mob/living/living_defense.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-03-07 02:06:18 -05:00
silicons 5d1cda26dc changes 2021-03-06 18:15:37 -07:00
silicons cf7d428ac6 changes 2021-03-06 18:11:40 -07:00
silicons c6ba7bfe1f changes 2021-03-06 18:06:53 -07:00
Letter N 4463fd9513 paperwork mini update, also ASS_BLAST_USA 2021-03-06 19:28:29 +08:00
Letter N 754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
silicons 8989394742 Merge pull request #14270 from LetterN/rustsql
Removes bsql 2
2021-03-03 00:53:46 -07:00
Letter N 889802a376 a 2021-03-03 14:16:36 +08:00
Letter N 4b62633fd8 a 2021-03-03 14:11:38 +08:00
Letter N 6514f4034c a 2021-03-02 12:57:26 +08:00
Letter N 364381937f fix+disallows admins rigging votes 2021-03-02 10:18:30 +08:00
silicons 1d8533c1cd Merge pull request #14324 from dzahlus/ash-drake-transform-powergaming
Changes to ash drake transformation
2021-03-01 18:42:28 -07:00
silicons b5bb90ecf8 Merge pull request #14290 from SandPoot/properlegioninheritance
Legions pass their type to the mob they infect
2021-03-01 18:35:37 -07:00
silicons 7af3c986ad Merge pull request #14328 from R3dtail/patch-3
Makes Clownification Less Abysmal :honk:
2021-03-01 18:32:29 -07:00
silicons c23db5daee Merge pull request #14327 from qweq12yt/pacifist-zombo-fix
fixes pacifist zombies
2021-03-01 18:26:16 -07:00
Letter N 09ce499146 aeiou 2021-03-01 21:55:34 +08:00
silicons 25a9f80c36 Merge pull request #14334 from SandPoot/this-proc-can't-be-split
Cannot modify null.real_name
2021-02-28 22:49:30 -07:00
silicons 0f16178425 changes 2021-02-28 02:43:32 -07:00
silicons 5d37871cd2 changes 2021-02-28 00:47:24 -07:00
silicons 519c694252 removes combat mode effects 2021-02-28 00:44:56 -07:00
silicons 8fc1dc9c29 changes 2021-02-28 00:40:04 -07:00
silicons e43838739d changes 2021-02-28 00:37:39 -07:00
silicons 70c828f74d changes 2021-02-28 00:27:14 -07:00
silicons 70b8d833c0 changes 2021-02-28 00:00:14 -07:00
Letter N 573f86e223 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-28 09:07:35 +08:00
qweq12yt d89bc85ae7 oops forgot a "/"
it could happen to anyone
2021-02-27 19:26:29 -03:00
qweq12yt 6d5afe146c restores any removed quirks when unchanging 2021-02-27 19:17:12 -03:00
SandPoot b3c2f52358 Update transform_procs.dm 2021-02-27 15:57:04 -03:00
qweq12yt d8d2a5d4c4 using quirk susbsysten instead of trats 2021-02-27 15:56:44 -03:00
SandPoot 0952777c56 upload transform_procs.dm 2021-02-27 15:53:17 -03:00
qweq12yt 04d478bb20 turning removes pacifism 2021-02-27 01:49:56 -03:00
Letter N 59990abd25 grr 2021-02-27 08:41:54 +08:00
R3dtail ccdfbbdc04 I'm really stupid.
// not \\
2021-02-26 15:33:37 -06:00
R3dtail 791ddd03d9 Tweaks anamolous crystal to prevent clown-griefing 2021-02-26 15:24:07 -06: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
dzahlus 12c7e22c28 ugh lavaland 2021-02-26 15:57:27 +01:00
silicons 37eaebe54a fix 2021-02-25 23:22:46 -07: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
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
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
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
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