Commit Graph

1616 Commits

Author SHA1 Message Date
silicons 36215c5d48 Merge pull request #14136 from shellspeed1/Fixes-infinite-floor-tiles
Ports a fix for infinite floor tiles from tg caused by a bug that was fixed a long time ago on tg code.
2021-01-25 23:01:23 -07:00
silicons 8e20e20184 Merge pull request #14059 from Hatterhat/no-corpse-headsets
removes headsets and flashes from more legion corpses
2021-01-25 22:58:05 -07:00
shellspeed1 8176bf30ff new line 2021-01-24 21:51:08 -08:00
shellspeed1 e85379eea2 a 2021-01-24 21:36:04 -08:00
raspy-on-osu f2d9643c75 init 2021-01-24 22:31:39 -05:00
raspy-on-osu 79640e912d bread in french (who added living bread?) 2021-01-24 19:30:15 -05:00
raspy-on-osu 622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
silicons 9f50ea66c8 Merge pull request #14104 from LetterN/semi-sync
[s] semi sync- we forgot the anti ddos thing
2021-01-20 15:14:37 -07:00
Lin d262f366e7 Merge pull request #14097 from Citadel-Station-13/silicons-patch-28
i'm not sure why cargo's bird crate has every bird spawn with a headset but let's not have that
2021-01-20 15:20:50 -06:00
Letter N 6547028272 what the fuck?? 2021-01-20 11:56:44 +08:00
Letter N 021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons 83566cdbe3 Update parrot.dm 2021-01-19 05:23:43 -07:00
silicons dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons 5f117a0331 Update basilisk.dm 2021-01-16 03:15:49 -07:00
Hatterhat 5e6ace2668 bruh 2021-01-14 20:49:46 -06:00
silicons ae290cf5f0 newlines 2021-01-13 16:56:36 -07:00
silicons ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
silicons 9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
DeltaFire bc29b80c94 :lazy: 2021-01-09 22:46:40 +01:00
DeltaFire 56a2892fd3 sigh 2021-01-08 23:48:32 +01:00
silicons ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Timothy Teakettle 44667ae1b6 edits 2021-01-07 16:46:42 +00:00
Timothy Teakettle 535dede85b i teleported bread 2021-01-05 22:20:41 +00:00
DeltaFire c699113061 Merge pull request #13928 from Citadel-Station-13/silicons-patch-57
while we're at it let's make holoparasites not carry radiation either thanks @lbd
2020-12-31 19:01:12 +01:00
silicons a9d831d10d Update guardian.dm 2020-12-30 14:36:39 -07:00
Xantholne 19c954fb39 asdafsafas 2020-12-29 21:04:08 -07:00
Xantholne 0db821f4f5 Fixes missing electus red from trying to be basic parrot and adds 2020-12-29 19:33:09 -07:00
Xantholne 121b1bb7fd Ports parrots from RP 2020-12-27 22:51:18 -07:00
raspy-on-osu 0e652cb64c init 2020-12-26 06:02:09 -05:00
Letter N a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
DeltaFire bece5971b8 Merge pull request #13745 from Arturlang/soulstone_references
Adds more sanity to construct soul returning
2020-12-11 00:42:30 +01:00
Artur ef13b07dd4 Forgot this 2020-12-09 17:56:28 +02:00
Artur 827920dba7 Paranoid ramblings 2020-12-09 17:54:44 +02:00
DeltaFire 21734b5d63 there we go 2020-11-26 23:04:39 +01:00
DeltaFire 566d74bd77 E 2020-11-26 16:12:08 +01:00
DeltaFire 67303ce7be Update medbot.dm 2020-11-26 00:19:47 +01:00
DeltaFire b487c7cb57 actually 2020-11-25 23:53:33 +01:00
DeltaFire f4bef53633 only care about robots if oxydam 2020-11-25 23:41:18 +01:00
silicons f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
Putnam3145 9d300ade35 Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
silicons b9b67f62a3 Merge pull request #13673 from Arturlang/sacrifice_tweaks
Makes construct mind saving reference the mind, fixing some issues
2020-11-17 01:10:45 -07:00
DeltaFire 8f04d7f0d1 Merge remote-tracking branch 'upstream/master' into system-corruption 2020-11-16 04:29:59 +01:00
silicons 9d7226cb4d Merge pull request #13670 from shellspeed1/master
Makes floor bots buildable with all toolboxes.
2020-11-15 17:12:37 -07:00
DeltaFire 922129abd2 proc override stuff 2020-11-15 21:12:01 +01:00
silicons 5b03f5b0ec more 2020-11-12 23:36:18 -07:00
Artur a4853561d3 Makes it reference the mind, not the body 2020-11-12 00:58:06 +02:00
shellspeed1 7a0c0a0e04 You can now build floor bots with any toolbox 2020-11-09 21:24:45 -08:00
Artur 8ce058a593 Fixes stupid mistakes 2020-11-09 14:39:51 +02:00
Artur 503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
silicons d500a12b70 adds EMOTE_BOTH and EMOTE_OMNI which is both audible/visible and ignores checks entirely. subtler/subtle is omni and regular emotes are both. (#13584)
* Update say.dm

* Update mob.dm

* Update emotes.dm

* Update say_vr.dm

* Update emote.dm

* Update emotes.dm

* Update mob.dm

* Update say_vr.dm

* Update drake.dm
2020-11-01 22:09:38 +01:00