Ghommie
|
6fe0c57c42
|
run-extra-times fixes.
|
2020-01-24 20:48:32 +01:00 |
|
 GhomandGitHub
|
d5daae98c7
|
Merge pull request #9905 from Trilbyspaceclone/glassware
[Ready] Cargo MK III - Glassware Addtion
|
2020-01-24 18:46:25 +01:00 |
|
 GhomandGitHub
|
4f611a31ff
|
viewers() instead of get_hearers_in_view()
|
2020-01-24 16:57:30 +01:00 |
|
 kevinz000andGitHub
|
f626322fbd
|
Merge pull request #10650 from Arturlang/patch-5
[READY]Adds cheap modular computers to the loadout
|
2020-01-24 00:32:57 -07:00 |
|
Seris02
|
9761d68f4b
|
more merge conflict fixes
|
2020-01-24 10:14:31 +08:00 |
|
 TrilbyspacecloneandGitHub
|
9466b0f4ca
|
Merge branch 'master' into glassware
|
2020-01-23 13:31:04 -05:00 |
|
Ghommie
|
52d5074051
|
Stops the patriotic cape from being considered a bed sheet.
|
2020-01-23 18:19:31 +01:00 |
|
Unknown
|
bd8ce9a7b6
|
Culturally Appropriate Lunar Clothes
|
2020-01-23 06:35:50 -07:00 |
|
Ghommie
|
762064edc0
|
Uhh...
|
2020-01-23 04:43:24 +01:00 |
|
Ghommie
|
5a8c22fef2
|
eh..,
|
2020-01-23 04:30:52 +01:00 |
|
Ghommie
|
8e44f21de9
|
Mh...
|
2020-01-23 04:27:08 +01:00 |
|
Ghommie
|
0bfe3ab87e
|
no longer can you wave at unseen things, nor bystanders will be informed of what you are waving at if they can't see it themselves.
|
2020-01-23 04:18:23 +01:00 |
|
 ArturlangandGitHub
|
0d8a0e4963
|
Hah.....
|
2020-01-22 18:12:04 +01:00 |
|
 ArturlangandGitHub
|
aeb3a2f971
|
Update backpack.dm
|
2020-01-22 18:07:43 +01:00 |
|
 ArturlangandGitHub
|
53d80b2ef8
|
Initial Commit
|
2020-01-22 17:55:09 +01:00 |
|
 kevinz000andGitHub
|
c345852abb
|
Update human_movement.dm
|
2020-01-22 01:53:53 -07:00 |
|
 kevinz000andGitHub
|
e5759f21e3
|
Update human_movement.dm
|
2020-01-22 01:52:20 -07:00 |
|
 kevinz000andGitHub
|
afe9498ebe
|
Update living.dm
|
2020-01-22 01:51:56 -07:00 |
|
 kevinz000andGitHub
|
871ae49192
|
Update living.dm
|
2020-01-22 01:12:44 -07:00 |
|
 kevinz000andGitHub
|
b47f92716e
|
Update human_movement.dm
|
2020-01-22 01:07:06 -07:00 |
|
 kevinz000andGitHub
|
4a40090061
|
Update human_movement.dm
|
2020-01-22 01:00:29 -07:00 |
|
kevinz000
|
12c832b40b
|
Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit
|
2020-01-20 17:53:06 -07:00 |
|
kevinz000
|
6e31db958c
|
fixes
|
2020-01-20 12:08:18 -07:00 |
|
kevinz000
|
7f17629404
|
O K
|
2020-01-19 23:38:47 -07:00 |
|
kevinz000
|
c0f8c1e68d
|
ok
|
2020-01-19 23:35:30 -07:00 |
|
kevinz000
|
89e204b980
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 23:12:17 -07:00 |
|
Hatterhat
|
28a2cc4a3d
|
.357 AP printable from illegal ballistics
|
2020-01-19 23:55:12 -06:00 |
|
 GhomandGitHub
|
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 |
|
kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|
Seris02
|
718ff58e0b
|
fixes + advanced injectors
|
2020-01-19 15:17:57 +08: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 |
|
 kevinz000andGitHub
|
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
|
ae4afdd904
|
made it work (wow!)
|
2020-01-17 03:09:46 -08:00 |
|
Putnam
|
c735123e4e
|
consent logging and arousal tweaks
|
2020-01-17 02:47:16 -08:00 |
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
kevinz000
|
9ef4cbfa76
|
refactor tags
|
2020-01-16 20:58:00 -07:00 |
|
 kevinz000andGitHub
|
d110d7bae9
|
Merge pull request #10347 from deathride58/stambufferbuff
[experimental] Buffs the stamina buffer by making it recharge for free.
|
2020-01-16 14:51:38 -07:00 |
|
kevinz000
|
b22e1a1cb4
|
compile
|
2020-01-16 02:27:35 -07:00 |
|
kevinz000
|
1d184b8cad
|
s
|
2020-01-16 00:21:21 -07:00 |
|
kevinz000
|
350c5aa060
|
compile
|
2020-01-16 00:18:40 -07:00 |
|
kevinz000
|
1acac87da3
|
compile
|
2020-01-15 23:54:30 -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 |
|
kevinz000
|
02841f8e92
|
compile
|
2020-01-15 18:49:37 -07: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 |
|
Seris02
|
a8e4989d74
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-01-15 12:15:13 +08:00 |
|
 HatterhatandGitHub
|
7b322ff467
|
Merge branch 'master' into greytide-standard-uniform
|
2020-01-14 19:39:16 -06:00 |
|