Commit Graph

26867 Commits

Author SHA1 Message Date
silicons ea56565872 fix 2021-01-14 20:19:04 -07:00
Hatterhat a468f400e3 see branch name 2021-01-14 20:55:06 -06:00
Hatterhat 798b25846d gauze parity 2021-01-14 20:53:55 -06:00
Hatterhat 5e6ace2668 bruh 2021-01-14 20:49:46 -06:00
silicons ecd3e6188d Update unsorted.dm 2021-01-14 19:30:13 -07:00
silicons faf210ead0 Update unsorted.dm 2021-01-14 18:36:00 -07:00
silicons 608465f1ed Update toxin_reagents.dm 2021-01-14 17:14:09 -07:00
silicons a9b3e6a514 Update carbon_defense.dm 2021-01-14 04:33:15 -07:00
Artur 19f27f2f59 Somehow forgot this very important detail 2021-01-14 10:57:46 +02:00
The0bserver b91df1403e The lack of recevier. It is the opposite of funny! 2021-01-14 01:31:58 -05:00
The0bserver e01c57c832 Show me the opposite of funny! 2021-01-14 01:12:53 -05:00
The0bserver 1b469bdfda The power of overwriting... 2021-01-14 01:03:48 -05:00
silicons 05fcd10506 Update carbon_defense.dm 2021-01-13 22:46:01 -07:00
silicons 1df2257e61 Merge pull request #14052 from SiliconMain/baitbegone
Update engineering.dm
2021-01-13 22:43:01 -07:00
SiliconMain cccb547a72 Update engineering.dm 2021-01-13 23:41:49 -06:00
silicons 1188431bcb Update carbon_defense.dm 2021-01-13 22:40:13 -07:00
The0bserver d957c1d105 another tweak 2021-01-14 00:02:32 -05:00
silicons 8f7b483161 remove reverb 2021-01-13 21:37:30 -07:00
The0bserver ffe401544c First wave of fixing 2021-01-13 23:35:37 -05:00
The0bserver 55cd69746d A change in tact, perhaps? 2021-01-13 23:08:05 -05:00
silicons 28849dd8e9 Merge pull request #14039 from Hatterhat/sticky-start
on the precipice of stickiness - sticky tape roundstart tech
2021-01-13 21:02:23 -07:00
The0bserver 2b8b9086ec Revert "Initial Commit:Goodbye rifle! You won't be missed!"
This reverts commit 1836d0106a.
2021-01-13 22:14:36 -05:00
The0bserver 1836d0106a Initial Commit:Goodbye rifle! You won't be missed! 2021-01-13 21:42:08 -05:00
silicons aa830b257a Merge pull request #13975 from zeroisthebiggay/paramed
resprites paramedic softsuit to not violate r*d cr*ss copyright and resprites the paramedic closet
2021-01-13 16:58:04 -07:00
silicons ce0891c2eb Merge pull request #14021 from DeltaFire15/emp-fuckeroni
Fixes combat mode being permanently disabled under specific circumstances
2021-01-13 16:57:42 -07:00
silicons ae290cf5f0 newlines 2021-01-13 16:56:36 -07:00
silicons 82cc5da8df Merge pull request #14034 from DeltaFire15/blindness-edgecase-fix
Fixes some edge cases regarding system corruption
2021-01-13 16:53:17 -07:00
silicons bcb2e16cef Merge pull request #14035 from SiliconMain/baitbegone
Comments out hololocks
2021-01-13 16:53:01 -07:00
silicons c66874f732 Merge pull request #14032 from kappa-sama/kaiowhat
two toggled self-buffing spells that have no relation to any anime or video game in particular
2021-01-13 16:50:50 -07:00
silicons 310a631ffa Merge pull request #14025 from DeltaFire15/synth-robotics-revival
More Synth tweaks
2021-01-13 16:48:05 -07:00
silicons f7cadc3293 Merge pull request #14009 from shellspeed1/wing-stuff
Ports a bunch of wings from cit RP and fulpstation [Ready]
2021-01-13 16:47:34 -07:00
silicons 9ddb3dc5d9 fix 2021-01-13 16:22:43 -07:00
DeltaFire 8b2044b407 another 2021-01-13 23:42:20 +01:00
silicons ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
DeltaFire 1a521b846f thanks 2021-01-13 23:39:36 +01:00
silicons 06bc57580a Update stunbaton.dm 2021-01-13 15:22:41 -07:00
silicons 701bacd355 Update stunbaton.dm 2021-01-13 15:06:35 -07:00
silicons 33ca6c34a1 Update pai.dm 2021-01-13 14:48:59 -07:00
silicons 343ef7db2c fixes 2021-01-13 14:23:35 -07:00
silicons 3fe2776a6a fix 2021-01-13 13:44:46 -07:00
Lin 04c5d34cb6 Merge pull request #14015 from DeltaFire15/synth-stuffs
Tweaks some Synth damage stuff
2021-01-13 18:40:03 +00:00
DeltaFire a9b420f68f Merge pull request #14038 from Hatterhat/atomization-never-heard-of-her
an unatomic PR designed for maximizing maintainer suffering
2021-01-13 18:28:59 +01:00
DeltaFire 7b02928558 Merge pull request #14036 from BlueWildrose/YouMadeMeDropMyCatgirl
You will no longer unbuckle fireman-carried/piggybacked people when touching someone on help or grab intent
2021-01-13 18:26:22 +01:00
corin9090 9f0280309d Belt slot prayer beads
uwu
2021-01-13 09:24:55 -08:00
DeltaFire 16c8ff1e52 Merge pull request #14027 from MrJWhit/stops-code-from-seeping-into-ic-chat
Port: "stops code from seeping into ic chat"
2021-01-13 18:21:30 +01:00
DeltaFire 84a95e5ddd Merge pull request #13994 from Citadel-Station-13/clowncar-safety
hugboxes admin twitchplays clown car to not explode on death to avoid killing people (by default)
2021-01-13 17:56:00 +01:00
DeltaFire 68557c84ae Merge pull request #14019 from timothyteakettle/stop-abusing-envys-knife
species with NOTRANSSTING cannot have envy's knife used on them
2021-01-13 17:54:57 +01:00
Timothy Teakettle db1c8034e3 Update living.dm 2021-01-13 15:58:23 +00:00
Artur 2f619ffc4e Traits 2021-01-13 10:27:10 +02:00
kiwedespars ce1d73a6ac Update dildos.dm 2021-01-12 22:42:01 -08:00