Commit Graph
3801 Commits
Author SHA1 Message Date
Ghommie 81b5fe2de3 Further buff and fix for clown ops tearstache nade. 2020-02-03 07:08:47 +01:00
kevinz000andGitHub 2393dc26eb Merge pull request #10779 from Ghommie/Ghommie-cit538
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
2020-02-02 16:31:59 -07:00
kevinz000andGitHub c24c83c1bd Merge pull request #10835 from Ghommie/Ghommie-cit546
Something about runtime errors.
2020-02-02 16:31:15 -07:00
GhomandGitHub ff0f9b5de8 Update say_vr.dm 2020-02-02 23:24:02 +01:00
GhomandGitHub 6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
2020-02-02 19:08:57 +01:00
Artur e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
kevinz000andGitHub 66a2216ef3 Merge pull request #10829 from Ghommie/Ghommie-cit544
Fixed and brutalized clown op slippery weapons a little.
2020-02-02 03:16:23 -07:00
kevinz000andGitHub 33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2020-02-02 01:47:24 -07:00
kevinz000andGitHub 38ec4f0e11 Update blood.dm 2020-02-02 01:35:38 -07:00
kevinz000andGitHub b59dd11adc Update blood.dm 2020-02-02 01:35:16 -07:00
Ghommie fedb05b3be A PR about runtime errors 2020-02-02 05:43:38 +01:00
Ghommie 8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00
GhomandGitHub 051811ed46 Merge pull request #10811 from Arturlang/crafting_componitization
[READY]Ports TG updates to crafting and componentizes it
2020-02-01 18:36:51 +01:00
Putnam3145andGitHub 33122d0d92 Merge branch 'master' into TGUIs_Nexties 2020-02-01 00:49:10 -08:00
Ghommie 8923810de2 Something about runtime errors. 2020-02-01 07:19:49 +01:00
Ghommie 07b6d278a1 fixed and brutalized clown op slippery weapons a little. 2020-02-01 04:48:40 +01:00
GhomandGitHub 1c5fe85545 Merge pull request #10793 from Tupinambis/MaskBugFix
Masks are now PROPERLY hidden my headgear that hides masks (Spacesuits, Hardsuits, Rad Hoods, Etc.)
2020-02-01 01:41:36 +01:00
Artur 54cd2585cf Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-01-31 23:18:51 +01:00
Ghommie 7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01:00
Artur 8bb0e30036 Initial Commit V3 2020-01-31 18:17:14 +01:00
Ghommie 188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
necromanceranne 43c4debb4f Repaths the formal security items into armor vest subtypes and subtypes of their respective owner's armors. Probably has some really silly balance ramifications. Oh and russian officers have armor vests now I guess. Oh and the sec wardrobe no longer has the formal suits. 2020-01-31 11:54:18 +11:00
LinandGitHub 2b47d868ad Merge pull request #10768 from kevinz000/quick_thing
moths can now chitter, and their laughs are now "unique"
2020-01-30 21:46:41 +00:00
Tupinambis e5ee5595e0 How the fuck was this not fixed for like a year. 2020-01-30 15:22:41 -06:00
ArturlangandGitHub 83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
Artur 1bf2a3e7ca Initial Commit 2020-01-30 17:28:02 +01:00
Seris02 bf47daf099 MY PRECIOUS! GONE!! GOOOOOONE!!! 2020-01-30 17:00:14 +08:00
Ghommie 05567e2292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit538 2020-01-30 03:42:50 +01:00
Ghommie 0dba1b5102 added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP. 2020-01-30 02:17:02 +01:00
kevinz000andGitHub 9df12f94d4 Merge branch 'master' into one_last_taser_attempt 2020-01-29 16:27:58 -07:00
kevinz000andGitHub e3a3c8f241 woops 2020-01-29 15:45:57 -07:00
LinandGitHub 293e6576c8 Merge pull request #10564 from kevinz000/optimization_1
Experimental optimizations
2020-01-29 19:25:13 +00:00
Ghommie 20e08d992f Removing unused vore files and commented out code. 2020-01-29 06:38:09 +01:00
GhomandGitHub 7839724013 Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2
Brain surgery can now fix an abductee's mindsnap objectives
2020-01-29 05:34:49 +01:00
kevinz000andGitHub d3343a1e26 Merge pull request #10697 from Citadel-Station-13/Ghommie-patch-2
Makes transfer_ckey() less pedant.
2020-01-28 17:59:00 -07:00
kevinz000andGitHub 3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -07:00
kevinz000andGitHub 96df844aa3 Merge pull request #10754 from MalricB/Virgomangood
Reunites Shaggy (hair from virgo) with Scooby Terrowin
2020-01-28 17:56:11 -07:00
kevinz000 9cf02ac96f moth sounds 2020-01-28 17:36:10 -07:00
kevinz000 57b977c2e5 why 2020-01-27 20:41:45 -07:00
Putnam3145andGitHub 209b681db1 Merge pull request #10706 from Ghommie/Ghommie-cit530
...? ...? (masked human mob examine pet peeve)
2020-01-27 19:02:13 -08:00
kevinz000 0eb13d8f23 refactors guns a bit 2020-01-27 17:39:49 -07:00
CygnusB 675e6cb9a6 Reunites Shaggy (hair from virgo) with Scooby Terrowin
self-insert baby pr florida man tries to merge his hair back into citadel
2020-01-27 15:51:38 -03:00
kevinz000andGitHub d17472b8f2 Update species.dm 2020-01-26 22:00:19 -07:00
kevinz000andGitHub 9292ff1972 Update damage_procs.dm 2020-01-26 13:27:54 -07:00
r4d6 31dd1bc69f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Dwarven_Language 2020-01-26 14:23:16 -05:00
r4d6 ac84ad803a Add dwarf language 2020-01-26 14:22:21 -05:00
GhomandGitHub 9aca79a640 Merge pull request #10466 from Citadel-Station-13/kevinz000-patch-10
Makes monkey gorrilize on radiation easier to achieve
2020-01-26 05:50:15 +01:00
kevinz000andGitHub 603ab65ed1 Merge pull request #10151 from Ghommie/Ghommie-cit450
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
2020-01-25 19:33:26 -07:00
kevinz000andGitHub 2acb52fb56 Merge pull request #10690 from Ghommie/Ghommie-cit525
Additional runtime fixes.
2020-01-25 05:54:35 -07:00
kevinz000andGitHub f199b720aa Merge pull request #10689 from Ghommie/Ghommie-cit524
Even more runtime fixes.
2020-01-25 05:54:20 -07:00