Commit Graph

1654 Commits

Author SHA1 Message Date
Ghom 98c8b6c5c8 Merge pull request #10648 from Citadel-Station-13/kevinz000-patch-19
Sprinting in general is now a config
2020-01-26 05:53:53 +01:00
kevinz000 2acb52fb56 Merge pull request #10690 from Ghommie/Ghommie-cit525
Additional runtime fixes.
2020-01-25 05:54:35 -07:00
kevinz000 ea9513864d Merge pull request #10674 from Xantholne/lunar01
Culturally Appropriate Lunar Clothes
2020-01-24 16:14:32 -07:00
Ghommie 6fe0c57c42 run-extra-times fixes. 2020-01-24 20:48:32 +01:00
Ghom d5daae98c7 Merge pull request #9905 from Trilbyspaceclone/glassware
[Ready] Cargo MK III - Glassware Addtion
2020-01-24 18:46:25 +01:00
Trilbyspaceclone 9466b0f4ca Merge branch 'master' into glassware 2020-01-23 13:31:04 -05:00
Unknown bd8ce9a7b6 Culturally Appropriate Lunar Clothes 2020-01-23 06:35:50 -07:00
Arturlang 0d8a0e4963 Hah..... 2020-01-22 18:12:04 +01:00
Arturlang aeb3a2f971 Update backpack.dm 2020-01-22 18:07:43 +01:00
Arturlang 53d80b2ef8 Initial Commit 2020-01-22 17:55:09 +01:00
kevinz000 c345852abb Update human_movement.dm 2020-01-22 01:53:53 -07:00
kevinz000 e5759f21e3 Update human_movement.dm 2020-01-22 01:52:20 -07:00
kevinz000 afe9498ebe Update living.dm 2020-01-22 01:51:56 -07:00
kevinz000 871ae49192 Update living.dm 2020-01-22 01:12:44 -07:00
kevinz000 b47f92716e Update human_movement.dm 2020-01-22 01:07:06 -07:00
kevinz000 4a40090061 Update human_movement.dm 2020-01-22 01:00:29 -07:00
Hatterhat 28a2cc4a3d .357 AP printable from illegal ballistics 2020-01-19 23:55:12 -06:00
Ghom 77911f9009 Merge pull request #10597 from Putnam3145/player-panel-can-reenter
Ghost role eligibility activation in player panel
2020-01-20 03:24:46 +01:00
Putnam 95dc861ad8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into player-panel-can-reenter 2020-01-18 03:39:35 -08:00
Putnam c612462b8c some demodularization + new eligibility stuff 2020-01-18 03:39:27 -08:00
Ghommie 9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01:00
kevinz000 aea0de30d1 Merge pull request #10125 from Ghommie/Ghommie-cit449
Ports a few projectile code updates by ke:b:inz.
2020-01-17 15:15:08 -07:00
Putnam fa0080d8d6 made climax with partner require EXPLICIT consent 2020-01-15 20:55:39 -08:00
Putnam 253a3a44ba moved "aphro" magic string to a define 2020-01-15 20:15:40 -08:00
Putnam a1922a459e Moved Arousal tab stuff to IC tab 2020-01-15 20:14:23 -08:00
Putnam d29603ad77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-15 15:57:32 -08:00
Hatterhat 7b322ff467 Merge branch 'master' into greytide-standard-uniform 2020-01-14 19:39:16 -06:00
Hatterhat 3622dd118b forgive me, grey jumpsuit entry 2020-01-14 19:38:11 -06:00
Ghommie 1d948907f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-13 23:26:21 +01:00
TrilbySpaceClone 04eab97058 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware 2020-01-13 11:54:14 -05:00
TrilbySpaceClone 92dc5e61c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware 2020-01-13 03:42:20 -05:00
Xantholne 903e59d6ed Merge branch 'master' into xantholne-christmas03 2020-01-12 22:29:59 -07:00
Hatterhat 7fac15caeb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into greytide-standard-uniform 2020-01-12 12:39:57 -06:00
Ghommie c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
Ghommie 02fbbd4f95 Ouch. 2020-01-12 16:54:08 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Hatterhat 7216ae545c how the hell did that fall out 2020-01-11 16:08:51 -06:00
Hatterhat 47fd3823e8 staff assistant jumpsuit gang 2020-01-11 15:58:24 -06:00
Putnam 48fadffbfb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-10 17:57:03 -08:00
Lin fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
2020-01-11 00:30:58 +00:00
kevinz000 8f60099595 Merge pull request #10488 from Xantholne/xantholne-cowboy02
Red Dead Redemption 2 but it's a crappy 2D space man game
2020-01-10 14:01:06 -08:00
Lin e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
Lin c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
Unknown 6cc856d9af Loadout Menu 2020-01-08 22:44:04 -07:00
kappa-sama d0cd6ae336 begone 2020-01-08 09:48:04 -05:00
Putnam c9fa4bc4eb whoops that wasn't working 2020-01-07 17:37:03 -08:00
Putnam 8fd7a3db8b added back climax with partner 2020-01-07 17:27:34 -08:00
Putnam cd35e516ac back by popular demand: maso/nympho 2020-01-07 17:01:14 -08:00
Trilbyspaceclone f7aa4f3050 Merge branch 'master' into glassware 2020-01-06 23:55:44 -05:00
Putnam 32043a9062 whoops forgot permaboner 2020-01-06 01:14:00 -08:00