Commit Graph

3389 Commits

Author SHA1 Message Date
Ghommie 6de290758b Oh, yea. 2020-03-05 19:07:24 +01:00
Ghommie 2cbdae2f0a Made flavor texts into an element datum. 2020-03-05 18:46:33 +01:00
Ghommie bb7bfc04cc Replaces EXCEPTION() with stack_trace() and CRASH() 2020-03-05 01:47:04 +01:00
Ghom d78cdb9b37 Merge pull request #11130 from BlackMajor/SpaceRuins
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
2020-03-04 23:46:10 +01:00
Ghom 7a2e0892d3 Merge pull request #11277 from kevinz000/sword_point
En garde! (nah just sword pointing)
2020-03-04 17:11:39 +01:00
Ghommie f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
Ghom df5b4ab56d Merge pull request #11321 from kevinz000/storage_components_are_bad
fixes storage closing while dragging, aka "this one line fix that i procrastinated giving a fuck about for about 9 months now"
2020-03-04 14:31:09 +01:00
BlackMajor 43e77f7d3a Last few fixes. Adds arcane wand to dead wizard roid. 2020-03-04 19:12:56 +13:00
kevinz000 5e2414bd90 fix 2020-03-03 22:25:35 -07:00
kevinz000 2d02ae0077 oops 2020-03-03 21:06:29 -07:00
kevinz000 cbf2355f19 Update code/datums/elements/sword_point.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-03 21:06:05 -07:00
kevinz000 6354b48659 fix 2020-03-03 20:58:06 -07:00
deathride58 49ad376e5e Adds a very basic soft restriction system. There's definite room for improvement, but this is good enough for now. Am too hongry for this. 2020-03-03 17:44:10 -05:00
Ghom 81bb6978de Merge pull request #11250 from Seris02/risingbassnerf
Rising bass nerfs and fixes
2020-03-03 13:26:19 +01:00
Seris02 8c4c2842d0 fixes and code improvements 2020-03-03 19:27:09 +08:00
kevinz000 1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Lin fde24492b9 Merge pull request #11294 from Ghommie/Ghommie-cit596
An old oversight with disease/var/viable_mobtypes.
2020-03-02 18:31:25 -06:00
kappa-sama 3c7a9f068e downvoted 2020-03-02 13:51:26 -05:00
Ghommie f08d79767b Removes makeshift switchblades 2020-03-02 19:33:31 +01:00
Kraseo 50a1feeb89 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-02 17:38:08 +01:00
Ghom 9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ
Bloodsucker external blood gain rebalancing
2020-03-02 16:36:22 +01:00
Trilbyspaceclone 9540c47adf Update recipes_clothing.dm 2020-03-02 00:24:36 -05:00
Trilbyspaceclone c6be46c6bd Update recipes_clothing.dm 2020-03-02 00:22:46 -05:00
Kraseo 5da4e5fbcd parte 5: tgui and javascript torture 2020-03-01 22:57:39 +01:00
Kraseo e3c77f2f5a part 4: the one where i slowly go insane 2020-03-01 22:05:35 +01:00
Seris02 8a647f8a8c happy now? 2020-03-02 04:22:40 +08:00
Ghommie c0ff43f827 ofc, New arguments. 2020-03-01 16:34:43 +01:00
Ghommie b0922dd70d Actually.. 2020-03-01 16:02:58 +01:00
Ghommie 893cca97a3 An old oversight with disease/var/viable_mobtypes. 2020-03-01 15:59:42 +01:00
Trilbyspaceclone 787edfb2a7 Update recipes_clothing.dm 2020-03-01 08:16:39 -05:00
TrilbySpaceClone 51c675603e ??? 2020-03-01 02:48:13 -05:00
Putnam 31b9dbd4ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types 2020-02-29 23:30:36 -08:00
Putnam f344af633f finalized. 2020-02-29 23:29:24 -08:00
Trilbyspaceclone 65b03d3a4e Update recipes_clothing.dm 2020-03-01 00:32:48 -05:00
Lin 70e2563579 Merge pull request #11266 from Ghommie/Ghommie-cit593
Fixing another couple mob holder oversights.
2020-02-29 00:13:58 -06:00
kevinz000 93d91b1808 Merge remote-tracking branch 'citadel/master' into sword_point 2020-02-28 13:39:56 -07:00
kevinz000 8ef68fa36b En garde! 2020-02-28 13:35:41 -07:00
kevinz000 e39d7fa49d Merge pull request #11259 from Ghommie/Ghommie-cit590
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
Seris02 b195783dfb yeet 6 2020-02-28 14:31:47 +08:00
kevinz000 56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
BlackMajor fc4f9e7800 How about a few more roids. 2020-02-28 16:07:57 +13:00
Ghommie 11f767d412 A couple mob holder oversights. Again? 2020-02-27 16:16:21 +01:00
Seris02 8140962275 yeet 4 2020-02-27 21:05:27 +08:00
Seris02 d3385fb8c8 yeet 3 2020-02-27 21:03:50 +08:00
Seris02 a14fe06241 probably fixes it 2020-02-27 20:51:19 +08:00
Seris02 6e6b8fbd8a yeet 2 2020-02-27 20:35:53 +08:00
Ghommie fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
Ghom 954f03f4e0 Merge pull request #11150 from raspyosu/master
Bloodsucker Abilities Tweaks/Rebalances
2020-02-27 00:54:41 +01:00
Seris02 de6e8012f3 balances yee 2020-02-26 17:49:37 +08:00
BlackMajor be740ba690 Merge branch 'master' into SpaceRuins 2020-02-26 20:58:46 +13:00