Commit Graph

19834 Commits

Author SHA1 Message Date
Putnam 7880340142 Make dynamic message in secret not bug me 2019-12-10 07:58:13 -08:00
Putnam3145 77d285a1c6 Update code/__DEFINES/atmospherics.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-12-10 07:53:28 -08:00
Ghommie 8ed21b47b6 Grammar and something. 2019-12-10 16:20:57 +01:00
Ghommie 19a3aca619 I fear for my powernet 2019-12-10 15:33:15 +01:00
kevinz000 f421649647 Update atoms_movable.dm 2019-12-09 23:00:59 -07:00
Seris02 36f2e5d9af Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass 2019-12-10 12:08:29 +08:00
Seris02 31950c106f change cost to 18 tc 2019-12-10 12:07:33 +08:00
BlackMajor 8817f04e19 Merge pull request #9747 from Ghommie/Ghommie-cit329
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
2019-12-10 11:18:55 +13:00
BlackMajor 8ce9dcc471 Merge pull request #10082 from Citadel-Station-13/kevinz000-patch-122
Bluespace launchpad QoL (read: powercreep)
2019-12-10 11:16:59 +13:00
BlackMajor 716df40d7a Merge pull request #10083 from Ghommie/Ghommie-cit439
Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter.
2019-12-10 11:15:56 +13:00
Putnam3145 0a8dcc3712 Merge pull request #10113 from Ghommie/Ghommie-cit448
Fixes a long lasting runtime with filter data sorting.
2019-12-09 13:49:41 -08:00
Putnam3145 ee65d93e5a Merge pull request #10086 from Ghommie/Ghommie-cit441
Fixes AI core display I may have broken with my coding extravaganza.
2019-12-09 13:41:25 -08:00
Putnam3145 12003e8f59 Merge pull request #10130 from kappa-sama/patch-13
unmodularize hulk
2019-12-09 13:40:52 -08:00
Putnam3145 5522b3d11d Merge pull request #10037 from Ghommie/Ghommie-cit421
Doubles locomotion circuit ext cooldown. Nerfs gun & pneumatic cannons circuits with sanity checks.
2019-12-09 13:34:23 -08:00
Putnam3145 c54523e324 Merge pull request #9629 from Citadel-Station-13/kevinz000-patch-87
can we not tell all the nonantags that antagonist ooc is enabled please
2019-12-09 13:25:37 -08:00
Putnam3145 975a40cadf Merge pull request #10094 from Trilbyspaceclone/patch-242
Fixes eletroplating of brozne/golden tool box
2019-12-09 13:23:13 -08:00
Putnam3145 739f873ca6 Merge pull request #10132 from Trilbyspaceclone/patch-243
Makes meat hook fit in boh again
2019-12-09 13:08:12 -08:00
Putnam3145 f33d4b3d18 Merge pull request #10108 from DeltaFire15/cbt-critical-fix
Screaming no longer is a viable strategy against clockies
2019-12-09 13:07:02 -08:00
Putnam3145 beddaa1a99 Merge pull request #10053 from Ghommie/Ghommie-cit429
Fixes some means of eyes blindness not working, removes legacy code.
2019-12-09 12:40:37 -08:00
Trilbyspaceclone 7c4fab127f Update necropolis_chests.dm 2019-12-09 15:37:22 -05:00
Putnam3145 01bb9d79d9 Merge pull request #10114 from r4d6/n2o-pressure-tank
Add a N2O Pressure Tank
2019-12-09 12:33:03 -08:00
kevinz000 d8dd0a4db5 bet
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-12-09 12:45:27 -07:00
Artur 488c0f1833 Mindshield fix and thrall buff 2019-12-09 19:08:42 +02:00
kappa-sama eb638adfa9 yw ghom 2019-12-09 10:10:14 -05:00
Putnam 54162947bc Also takes into account external temp (radiation coming back in, specifically) 2019-12-09 07:10:01 -08:00
kappa-sama f790d675d9 flavor text 2019-12-09 09:06:11 -05:00
Seris02 d73cb74f95 clown loudmode headset 2019-12-09 21:40:39 +08:00
Putnam 75d8be980a atmos tweaks 2019-12-09 02:00:58 -08:00
kevinz000 1866276d38 wrong intent 2019-12-08 22:13:15 -07:00
kevinz000 0dc69942a9 Update carbon.dm 2019-12-08 22:08:29 -07:00
kevinz000 4ba64f5fa7 Update atoms_movable.dm 2019-12-08 22:05:13 -07:00
kevinz000 5cbcc06497 Update objs.dm 2019-12-08 22:04:32 -07:00
kevinz000 f8c6f0eb8a Update items.dm 2019-12-08 22:03:35 -07:00
kevinz000 cd1cf1e1e3 Update carbon.dm 2019-12-08 22:01:50 -07:00
kevinz000 20defaba8e Update conveyor2.dm 2019-12-08 21:46:53 -07:00
kappa-sama e111429a30 the hippie thing 2019-12-08 23:37:33 -05:00
Lin 7794cea49c Merge pull request #9538 from Citadel-Station-13/kevinz000-patch-99
Brings the combat back in combat defibrillator (DOES NOT BUFF CMO DO NOT YELL AT ME)
2019-12-09 04:33:23 +00:00
kevinz000 c0f8a42e0f Update eyes.dm 2019-12-08 19:49:15 -07:00
kevinz000 3e559b6d38 Update lighting.dm 2019-12-08 19:46:38 -07:00
kevinz000 c38f4989be Update eyes.dm 2019-12-08 19:45:27 -07:00
kevinz000 6cbb0e3ca8 Update good.dm 2019-12-08 19:44:26 -07:00
kevinz000 3cacb998dd Merge pull request #9903 from PersianXerxes/removeFreeNVG
Removes the night vision quirk
2019-12-08 19:37:06 -07:00
kevinz000 9869c1c440 Merge pull request #10099 from Ghommie/Ghommie-cit446
Fixes a few holo barriers lacking transparency.
2019-12-08 19:05:10 -07:00
loginsandylogout 2c08f7ac95 oops 2019-12-08 17:25:17 -06:00
loginsandylogout 1bae17a2de gauze 2019-12-08 17:24:12 -06:00
loginsandylogout 17782a8c87 ports refactor 2019-12-08 17:10:50 -06:00
Ghommie 414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Lin 6368f04f2d Merge pull request #10044 from Ghommie/Ghommie-cit423
Made wooden cabinet/closets... actually made of wood.
2019-12-08 22:18:15 +00:00
Artur d184bdd77a Whoops 2019-12-08 22:22:30 +02:00
Linzolle 1e2a4f606c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-08 14:17:00 -06:00