Commit Graph

28303 Commits

Author SHA1 Message Date
Putnam
833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
silicons
b188a6ea0f why 2021-06-11 16:15:31 -07:00
Putnam
571a25c052 Finished the first auxgm expansion 2021-06-11 16:15:00 -07:00
Putnam
eda6a4d2e2 Aaaa 2021-06-11 05:23:24 -07:00
BlackMajor
86881dc1af Merge pull request #14768 from Citadel-Station-13/silicons-patch-33
makes xenos immune to stamina damage, with something that might be potentially horrifically abusable but isn't really fixable in a clean way yet
2021-06-11 12:52:12 +12:00
Putnam
3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -07:00
silicons
5e4f3ed694 Merge pull request #14683 from keronshb/shovedisarmgun
Off Balance Disarms only if shoved into a wall or person.
2021-06-09 12:14:37 -07:00
keronshb
33affb4f10 THREE SECONDS 2021-06-09 15:14:07 -04:00
silicons
09d61c3bec Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon
New Challenger: The Cat Surgeon has appeared! (Ready!)
2021-06-09 11:29:24 -07:00
silicons
a77aa8bd41 Merge pull request #14766 from Linzolle/cultfix
Fix cult area shenanigans, cult can do stuff in maint again.
2021-06-09 11:22:26 -07:00
silicons
224efa0e26 Merge pull request #14762 from DrPainis/patch-2
adds cat meteors
2021-06-09 11:21:55 -07:00
silicons
eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport
Ports Floor Cluwnes and Cluwnes.
2021-06-09 11:21:22 -07:00
silicons
996a99b7f4 Merge pull request #14759 from Arturlang/uplink_misc_item_rebalances
Changes the cost of the holoparasite injector and the ricochet eyepatch
2021-06-09 11:21:12 -07:00
silicons
a56ac3ce07 Merge pull request #14749 from DrPainis/patch-14
adds goliath calamari (currently untested because Forget™)
2021-06-09 11:20:49 -07:00
silicons
30e7939e0e Merge pull request #14771 from keronshb/disposalcargo
Lets the Cargo Shuttle use Disposal Pipes again
2021-06-09 11:19:40 -07:00
silicons
564a3aaa4b Merge pull request #14796 from MrJWhit/the-pr-that-gets-people-pissed
Moves medical holodeck to restricted
2021-06-09 11:18:32 -07:00
silicons
b28d4f26f3 Merge pull request #14803 from bunny232/airmixies
21/79 not 20/80
2021-06-09 11:18:10 -07:00
silicons
dcd80edf5f Merge pull request #14806 from zeroisthebiggay/patch-11
cuts the amount of essence revenant objective needs in half so it is actually feasibly possible
2021-06-09 11:17:52 -07:00
silicons
0ee2892bee Merge pull request #14807 from Putnam3145/make-sleeper-pref-good
makes medihound sleeper toggle do something
2021-06-09 11:17:39 -07:00
silicons
7af470efef Merge pull request #14808 from SandPoot/fixes-soulstones
Fixes soulstones runtiming
2021-06-09 11:17:25 -07:00
silicons
c7df74f452 Merge pull request #14810 from zeroisthebiggay/patch-12
Clowncar exploit fix
2021-06-09 11:17:17 -07:00
silicons
ec63a4c62b Merge pull request #14779 from Arturlang/Orbit_menu_antags
Makes orbit menu show antags if DNR
2021-06-09 11:17:14 -07:00
silicons
3d86ce9bda Merge pull request #14787 from WanderingFox95/WanderingFox95-ORV-Revamp
ORV Uniform Revamp
2021-06-09 11:17:06 -07:00
silicons
a7781f77fd Merge pull request #14802 from bunny232/atmosfoam
Atmos resin buff? fix?
2021-06-09 11:15:56 -07:00
silicons
2402c56bfc Merge pull request #14805 from bunny232/hydroslimejelly
Hydroponics slimejelly recipe from tg
2021-06-09 11:15:36 -07:00
silicons
c0e3b8d5ef Merge pull request #14809 from SandPoot/speak-nice-yes
Centralizes borg speech and uses some of the icons for the typing indicator
2021-06-09 11:15:01 -07:00
silicons
259aed7903 Merge pull request #14783 from DeltaFire15/spec-species-color
Colors species names depending on traits
2021-06-09 11:14:48 -07:00
silicons
fe8323f503 Merge pull request #14747 from keronshb/reinforcedplasmawindowsteps
Adds more deconstruction steps to stronger windows.
2021-06-09 11:13:13 -07:00
silicons
7963dce24e Merge pull request #14712 from keronshb/hereticadjustments
Minor Heretic rework and fixes (Includes shifting realities and more)
2021-06-09 11:12:23 -07:00
silicons
716c2a04e4 Merge pull request #14160 from keronshb/motivation
Adds a new traitor item, Motivation (Part 1)
2021-06-09 11:10:17 -07:00
Putnam
56b5c68172 the linter is your friend 2021-06-08 19:15:30 -07:00
Putnam
268d3ec408 Fixed the funny UI stuff 2021-06-08 18:22:15 -07:00
zeroisthebiggay
082ffa16f3 Update car.dm 2021-06-08 15:43:32 -04:00
Putnam
86177c51c4 auxgm part 1
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
SandPoot
b0940456f5 upload files 2021-06-08 13:13:22 -03:00
SandPoot
00bb96d467 upload soulstone.dm 2021-06-08 12:32:12 -03:00
Putnam
80e8c8af4a WHOOPS I SWAPPED FILTERS 2021-06-08 02:40:32 -07:00
Putnam
fcd1ec83cc removed redundant check 2021-06-08 00:25:31 -07:00
Putnam
f6e08a8d2a include a message too 2021-06-08 00:24:54 -07:00
Putnam
a236357ebe makes medihound sleeper toggle do something 2021-06-08 00:21:19 -07:00
zeroisthebiggay
536135ec02 last bit of finetuning 2021-06-08 01:17:10 -04:00
zeroisthebiggay
55075fb31b Update revenant.dm 2021-06-08 01:15:03 -04:00
zeroisthebiggay
538f1c802d Update revenant.dm 2021-06-08 01:13:12 -04:00
bunny232
1a72070f5c slimejelly
a
2021-06-07 21:44:33 -04:00
Putnam
7952a1cf88 this actually does not need named this way 2021-06-07 05:31:41 -07:00
Putnam
d03bf641dd extreme optimization project to maybe fix game 2021-06-06 21:58:24 -07:00
bunny232
26544ddbb7 21/79 not 20/80 2021-06-06 17:24:10 -04:00
bunny232
7826ced174 Update effects_foam.dm 2021-06-06 12:54:07 -04:00
Lin
27d7b4b564 Merge pull request #14793 from bunny232/pool-fog
Pools now get misty at warm insteaed of scalding
2021-06-05 16:26:21 -05:00
WanderingFox95
7884ccf316 Only 5 units are necessary, so why keep it at 10?
I mean, this is the refining process
2021-06-05 14:51:59 +02:00