Commit Graph

27956 Commits

Author SHA1 Message Date
YakumoChen fba17abaf4 god damn it Trilby 2021-01-16 08:23:08 +00:00
silicons 98bc547c5b Update say.dm 2021-01-16 01:07:52 -07:00
necromanceranne 6ac010e442 Merge branch 'master' into robocoat 2021-01-16 04:56:03 +11:00
DeltaFire 3e917653c7 Merge pull request #14044 from corin9090/beadies
Belt slot prayer beads
2021-01-15 18:50:14 +01:00
DeltaFire d331dd4b1e Merge pull request #14046 from Citadel-Station-13/silicons-patch-10
buffs and fixes BOOMERANG STUNBATONS
2021-01-15 18:30:32 +01:00
DeltaFire de40e96180 Merge pull request #14047 from Citadel-Station-13/silicons-patch-11
boomerangs now properly turn ON your throw mode rather than turning it off when it already is
2021-01-15 18:30:16 +01:00
DeltaFire aa1cae9f33 Merge pull request #14054 from TheObserver-sys/AReturnToForm
Returns the Maintenance Shotgun to it's original recipe. Removes the Maintenance Rifle, and associated items.
2021-01-15 18:22:05 +01:00
DeltaFire f1d254f4e5 Merge pull request #14057 from Citadel-Station-13/silicons-patch-15
removes stealthmin orbit block
2021-01-15 18:15:56 +01:00
DeltaFire 771a4f3c41 Merge pull request #14060 from Hatterhat/shrink-removal
removes shrink ray again because "wait, whose idea was to readd this?" (turns out it was shoehorned back in by lettern during the tgui port)
2021-01-15 18:14:42 +01:00
silicons 68e9be9647 Merge pull request #14042 from kiwedespars/dildo-1
adds klonk sound effect for literal horsecock dildo
2021-01-15 04:00:08 -07:00
kappa-sama 1134e1ce20 i don't wanna talk about it 2021-01-15 00:36:45 -05:00
silicons 8e8d1571f0 sigh 2021-01-14 20:43:27 -07:00
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
Dan-Neposh 04d5721c4d Merge branch 'master' into clockcultrework_v2 2021-01-14 19:51:15 -05:00
silicons 608465f1ed Update toxin_reagents.dm 2021-01-14 17:14:09 -07:00
Dan-Neposh 6ddfa8170f Adds a round ending sequence to Ratvar's spawn
Along with its sounds + making the Neovgre cannon sound better. Audio courtesy of Dzahlus.
2021-01-14 18:29:50 -05:00
Dan-Neposh ab5cffc360 Various edits in order to get this PR out finally 2021-01-14 12:56:55 -05: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