Commit Graph

18732 Commits

Author SHA1 Message Date
Timothy Teakettle e78383f4fa typo 2020-10-30 19:42:02 +00:00
Timothy Teakettle f4f322dd0e better fix 2020-10-30 19:39:43 +00:00
deathride58 b11947a468 covers filters and mixers as well 2020-10-29 21:31:06 -04:00
deathride58 5d79ea3441 forgot volume pumps, fuk 2020-10-29 21:00:56 -04:00
deathride58 75280c9705 patches recently-found atmos circuit exploit 2020-10-29 20:27:47 -04:00
DeltaFire 5f32fa88e9 biomech wound surgeries
Since IPCs and synths can get wounds, they should prooobably also have access to the surgeries to fix them. instead of having to use the super-slow ways.
2020-10-29 21:34:54 +01:00
Trilby 3307711f08 suppression 2020-10-28 13:00:02 -04:00
silicons 1baa3013b3 Merge pull request #13626 from zeroisthebiggay/GOD
[SALT] MAKES MEGAFAUNA ITEMS LAVAPROOF (LIKE THE LAVA STAFF)
2020-10-28 07:53:44 -07:00
silicons 0307884eab Merge pull request #13627 from Ghommie/Ghommie-cit841
Here I fix a few issues.
2020-10-28 07:53:22 -07:00
silicons 2d842270f5 Merge pull request #13625 from LetterN/revert-12994-patch-37
Reverts this circuit frame removal
2020-10-28 07:53:15 -07:00
silicons 598c2fab2b Merge pull request #13616 from Citadel-Station-13/Ghommie-patch-1
Quick clown/mime masks designs fix.
2020-10-28 07:49:38 -07:00
silicons 5c53a2cbe2 Merge pull request #13607 from timothyteakettle/polychrome-maid
polychromic maid outfit
2020-10-28 07:46:55 -07:00
silicons f2747a3b1c Merge pull request #13605 from Trilbyspaceclone/patch-403
Adds corporate uniforms to the clothing vender
2020-10-28 07:46:24 -07:00
silicons 1a1b6af819 Merge pull request #13603 from kappa-sama/patch-43
controversial shotgun buff (very scary)
2020-10-28 07:44:02 -07:00
silicons 6d2028abb5 Merge pull request #13601 from timothyteakettle/critical-item
antagonistic items will no longer fail to be placed on you
2020-10-28 07:43:39 -07:00
Dan-Neposh 8fe7c23766 Clockwork generators
TODO: get it to stop dividing by zero for power production and fuel usage, make it generate power.
2020-10-28 08:44:42 -04:00
Hatterhat a4196e567b i told me there'd be balance issues 2020-10-27 22:35:27 -05:00
timothyteakettle cf49e78d45 Merge remote-tracking branch 'upstream/master' into i-hate-mcolor 2020-10-27 22:12:55 +00:00
timothyteakettle a987420d22 fix for mam markings 2020-10-27 21:40:07 +00:00
timothyteakettle a9f2b86da9 tonne of fixes 2020-10-27 21:32:08 +00:00
timothyteakettle 2275dde281 prior fix didnt work this does 2020-10-27 00:15:58 +00:00
timothyteakettle 79e81a455a old fix 2020-10-26 23:52:20 +00:00
Timothy Teakettle f468e4940a typo 2020-10-26 20:33:46 +00:00
Timothy Teakettle 4e6146898c fixes/config edits 2020-10-26 20:27:58 +00:00
Timothy Teakettle 2b00f2bb2f config values 2020-10-26 20:27:02 +00:00
Timothy Teakettle 38313fa362 i hate dwarves 2020-10-26 17:50:21 +00:00
Timothy Teakettle cfefe99d35 okay so what if its not quirks 2020-10-26 17:45:43 +00:00
timothyteakettle e35b3e4a33 color editing 2020-10-26 00:47:40 +00:00
timothyteakettle 926b63ba06 stop using double spaces 2020-10-25 22:54:53 +00:00
Timothy Teakettle 0c2e1997ce more loadout 2 2020-10-25 22:49:39 +00:00
Ghommie 444a440fba oh 2020-10-25 15:38:36 +01:00
Ghommie f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie 90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
Delams-The-SM 52abbbf247 Fixes matrix color radomisation in /proc/randomize_human (#13599) 2020-10-25 13:07:46 +01:00
zeroisthebiggay 626fcf0aeb OOPS
FUCK
2020-10-25 05:36:59 -04:00
zeroisthebiggay 2c278ba370 A
A
2020-10-25 05:34:53 -04:00
zeroisthebiggay 5eec2b76f5 OK MAYBE NOT INDESTRUCTIBLE
OK
2020-10-25 05:34:24 -04:00
zerothebigboy 6577aaac91 FRUSTRATION 2020-10-25 05:30:06 -04:00
Letter N 3d2bd4a98e Revert "removes dildo" 2020-10-25 12:55:04 +08:00
timothyteakettle 71134ed8c3 better loadout flags 2020-10-25 01:08:35 +00:00
Arturlang d3616f2d17 Fixes hijack UI (#13598)
* Fixes hijack UI

* This was lost too it seems

* And this

* More stuff that was removed

* Should be good now

* Nice and proper now
2020-10-24 21:23:52 +02:00
silicons 585208dda9 Update angel.dm (#13621) 2020-10-24 21:22:32 +02:00
silicons 3293715025 Update items.dm (#13622) 2020-10-24 21:22:01 +02:00
timothyteakettle a39dea1b4d json loadout 2020-10-24 00:31:45 +01:00
Timothy Teakettle 78d8e1fcee debug 2020-10-23 22:03:21 +01:00
Vynzill ff6850b9b0 jungle gateway map 2020-10-23 15:11:27 -05:00
Timothy Teakettle f17bf787e7 render antennas 2020-10-23 20:19:25 +01:00
Ghom 5d0e26e9a1 Quick clown/mime masks designs fix. 2020-10-23 18:08:54 +02:00
Timothy Teakettle f778ec0199 yeah lets maybe render stuff 2020-10-22 01:33:53 +01:00
timothyteakettle a9a4d00171 second qol 2020-10-22 00:08:33 +01:00