Commit Graph

1672 Commits

Author SHA1 Message Date
SandPoot b0940456f5 upload files 2021-06-08 13:13:22 -03:00
LetterN 2bf221be4f fixes syndie simplemob 2021-05-09 21:35:15 +08:00
silicons 17d7c4dd9a Merge pull request #14659 from DrPainis/patch-12
Bubblegum HALLUCINATIONS are capitalized
2021-04-28 21:17:15 -06:00
DrPainis e313fed033 hallucinations are capitalized too 2021-04-25 19:04:07 -04:00
WanderingFox95 ace2f522fb No more Suicidal Parrots! (Ready) (#14628)
* Modifies Parrots

They spawn from hostile triggers, not as friendly pets now.

* Removes Parrots from Gold Extracts altogether
2021-04-24 21:47:04 +02:00
DrPainis 7d6cb67c91 literally just changes one letter (#14634) 2021-04-24 21:40:41 +02:00
silicons 75e3f5eae6 Merge pull request #14573 from zeroisthebiggay/eatshitanddie
pov: you're an enraged miner main that hates having their loot require a modicum of effort (ports tg ash drake)
2021-04-21 13:50:46 -06:00
DrPainis ac96276f8e literally just changes one letter 2021-04-20 16:20:44 -04:00
silicons af7bb2e09f Merge pull request #14585 from zeroisthebiggay/cumbblegum
pov: you're watching zero ruin megafauna by making them DDR raves one pr at a time (ports epic tg bubblegum)
2021-04-18 19:00:14 -06:00
DrPainis ec67182421 makes drakes drop meat 2021-04-17 02:58:22 -04:00
Lin 3fc5dc5d36 Merge pull request #14267 from Citadel-Station-13/silicons-patch-15
allows all non queen/empress SIMPLE MOB xenos to spawn from gold cores
2021-04-11 13:54:52 -05:00
Blue Wildrose a625b1d770 Fixed drones nullspacing things they place on tables and in closets 2021-04-07 21:45:04 -07:00
zerothebigboy c104ab1fc4 sex 2021-04-07 04:54:06 -04:00
zerothebigboy cb7259f4e2 sex 2021-04-07 04:44:57 -04:00
zerothebigboy 657d1f69c8 sex 2021-04-07 04:18:04 -04:00
zerothebigboy f1b45b3839 eatshitanddie 2021-04-05 21:55:17 -04:00
Blue Wildrose f1ef779e58 Bumbles no longer has a number beside their name 2021-04-01 16:53:47 -07:00
Blue Wildrose 4de7af5db5 Bumbles no longer has a number beside their name 2021-04-01 16:31:15 -07:00
silicons e0cc6e3502 Merge pull request #14391 from kiwedespars/void-but-for-real
[HERETICS] Void & a handful of heretics-related PRS
2021-03-18 06:38:40 -06:00
DeltaFire be41ead215 Merge pull request #14319 from silicons/async_2
enforces SHOULD_NOT_SLEEP on Life(), fixes some more process() sleeps that might be causing controller lockups
2021-03-15 17:01:42 +01:00
kiwedespars 8f1715704d Merge branch 'master' into void-but-for-real 2021-03-12 23:58:49 -08:00
silicons 753d79be69 Update boss.dm 2021-03-11 05:54:36 -07:00
kiwedespars 3b92e33112 Merge branch 'master' into void-but-for-real 2021-03-09 12:29:50 -08:00
kiwedespars 3ce6459aef void heretic and many other prs 2021-03-09 02:58:34 -08:00
silicons 771809a6d0 Merge branch 'master' into async_2 2021-03-09 00:17:26 -07:00
Letter N 754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +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
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
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 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 841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing
Tool behavior replacing
2021-02-21 14:48:50 -07:00
Letter N 7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08:00
shellspeed1 f17be50d5f Revert "Fix for floorbots not placing a plate before placing a floor." 2021-02-18 23:28:10 -08:00
Letter N 037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
silicons 2a6e70941d Update alien.dm 2021-02-18 17:41:27 -07:00
silicons ce013a5122 Update alien.dm 2021-02-18 17:34:51 -07:00
silicons 3ef52e039f Update alien.dm 2021-02-18 17:29:40 -07:00
silicons 21ffcc0318 Update alien.dm 2021-02-18 17:27:44 -07:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot 2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Lin 460042bc33 Merge pull request #14248 from shellspeed1/trying-to-make-floor-bots-actually-do-a-decent-job-of-repairs
Fix for floorbots not placing a plate before placing a floor.
2021-02-17 17:28:03 -06:00