 Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
|
kevinz000
|
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 |
|
|
kevinz000
|
33577e0d82
|
Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
|
2020-02-02 01:47:24 -07:00 |
|
|
kevinz000
|
38ec4f0e11
|
Update blood.dm
|
2020-02-02 01:35:38 -07:00 |
|
|
kevinz000
|
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 |
|
|
Seris02
|
18489e5b65
|
merge fixes
|
2020-02-02 11:51:26 +08: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 |
|
|
Ghommie
|
55fa48737e
|
Forgot about not versioned files.
|
2020-02-02 01:28:16 +01:00 |
|
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
|
Ghom
|
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 |
|
|
Putnam3145
|
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 |
|
|
Ghom
|
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 |
|
|
Lin
|
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 |
|
|
Arturlang
|
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 |
|
|
kevinz000
|
9df12f94d4
|
Merge branch 'master' into one_last_taser_attempt
|
2020-01-29 16:27:58 -07:00 |
|
|
kevinz000
|
e3a3c8f241
|
woops
|
2020-01-29 15:45:57 -07:00 |
|
|
Lin
|
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 |
|
|
Ghom
|
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 |
|
|
Detective Google
|
cc2ce746d8
|
Merge remote-tracking branch 'upstream/master' into the-p-o-o-l
|
2020-01-28 20:19:55 -06:00 |
|
|
kevinz000
|
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 |
|
|
kevinz000
|
3bf0e1d5c4
|
Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
|
2020-01-28 17:57:26 -07:00 |
|
|
kevinz000
|
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
|
611fd7ea89
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-27 23:35:35 -07:00 |
|
|
kevinz000
|
171d50caff
|
Update sharks.dm
|
2020-01-27 22:22:34 -07:00 |
|
|
kevinz000
|
57b977c2e5
|
why
|
2020-01-27 20:41:45 -07:00 |
|
|
Putnam3145
|
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 |
|
|
kevinz000
|
d17472b8f2
|
Update species.dm
|
2020-01-26 22:00:19 -07:00 |
|
|
Seris02
|
e45cc4933c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
|
2020-01-27 08:33:38 +08:00 |
|
|
Seris02
|
0d1e458e9c
|
yuh
|
2020-01-27 08:32:45 +08:00 |
|
|
kevinz000
|
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 |
|
|
Ghom
|
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 |
|