 Poojawa
|
d71f37167f
|
I'm about to go fucking APE
None of this is actually viable, Footprints aren't taking proper color, aren't updating their color. It's just default red. screm
|
2019-08-16 04:58:16 -05:00 |
|
|
Poojawa
|
0290a46ddc
|
Impliments Ghom review, reverts blood list back to component
|
2019-08-15 12:32:44 -05:00 |
|
|
Poojawa
|
2073921f4b
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-08-15 08:39:41 -05:00 |
|
|
Poojawa
|
b671384015
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-08-15 08:23:48 -05:00 |
|
|
kevinz000andGitHub
|
2cdfa9cf2f
|
Merge pull request #9126 from Sishen1542/viro-cures
Adds more variety in virus cures, more consistent difficulty scaling.
|
2019-08-15 01:12:12 -07:00 |
|
|
deathride58andGitHub
|
9010b9003a
|
Merge pull request #8930 from Citadel-Station-13/kevinz000-patch-54
Fixes nanite viruses take two
|
2019-08-14 15:01:33 -04:00 |
|
|
Sishen
|
382487fdc2
|
viruseseses-cures
|
2019-08-13 05:32:37 -04:00 |
|
|
kevinz000andGitHub
|
69884d1abe
|
Merge pull request #9062 from Trilbyspaceclone/patch-207
Makes smile not as horrable.
|
2019-08-11 10:08:45 -07:00 |
|
|
Poojawa
|
dcd682bd59
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-08-10 23:48:47 -05:00 |
|
|
Poojawa
|
2b2bdb37ba
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-08-10 23:26:20 -05:00 |
|
|
Poojawa
|
d496e16dde
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-08-10 19:14:41 -05:00 |
|
|
Ghommie
|
efe72ce973
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-08-09 06:47:27 +02:00 |
|
|
Poojawa
|
283b5d050e
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-08-08 16:51:53 -05:00 |
|
|
Fermi
|
1fb07e286a
|
Removing reviewer comments incase of fullmerge.
|
2019-08-08 19:53:07 +01:00 |
|
|
Ghommie
|
23e3263fcb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
|
2019-08-08 04:46:54 +02:00 |
|
|
Poojawa
|
b5841c718b
|
Genpop for security
|
2019-08-07 06:14:35 -05:00 |
|
|
ThalpyandGitHub
|
2256bbb63c
|
Merge branch 'master' into master
|
2019-08-07 09:30:53 +01:00 |
|
|
kevinz000andGitHub
|
2959a87892
|
Merge pull request #9022 from Ghommie/Ghommie-cit175
Ports "More robust dorfs."
|
2019-08-07 00:51:19 -07:00 |
|
|
kevinz000andGitHub
|
a845b5ae0c
|
Merge pull request #8986 from Ghommie/Ghommie-cit163
reworked ninja stealth, made ninja shoes completely silent, cleaned up scarily old code.
|
2019-08-07 00:49:23 -07:00 |
|
|
kevinz000andGitHub
|
6db8d9aef4
|
Merge pull request #9017 from Trilbyspaceclone/patch-205
Ports "Some stealth box changes #45332" Aka nerfing Stealth boxes
|
2019-08-07 00:48:12 -07:00 |
|
|
ThalpyandGitHub
|
53e9c140cf
|
Merge pull request #22 from Citadel-Station-13/master
YARR
|
2019-08-06 16:08:16 +01:00 |
|
|
TrilbyspacecloneandGitHub
|
7a22e73a79
|
Update speech.dm
|
2019-08-06 08:47:10 -04:00 |
|
|
Ghommie
|
8978f0ecf9
|
Defaults the teleportation forceMove arg to TRUE.
|
2019-08-05 18:19:48 +02:00 |
|
|
ThalpyandGitHub
|
5795f6bbe2
|
Merge branch 'master' into master
|
2019-08-05 09:09:36 +01:00 |
|
|
kevinz000andGitHub
|
aea2f6f523
|
Merge pull request #8900 from Seris02/spaceruinsyee
Abductor Replication Lab space ruin - take 2
|
2019-08-05 00:55:40 -07:00 |
|
|
kevinz000andGitHub
|
f1c9a07f6d
|
Merge pull request #8912 from Ghommie/Ghommie-cit146
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
|
2019-08-04 22:41:49 -07:00 |
|
|
kevinz000andGitHub
|
53a9f3ac51
|
Merge pull request #9036 from Linzolle/invisiclothes
fixes combat gloves plus having no icon, allows for shoes to have their item_state set to use a differently named icon on mobs
|
2019-08-04 19:09:36 -07:00 |
|
|
kevinz000andGitHub
|
27b3cb6656
|
Merge pull request #9018 from Ghommie/Ghommie-cit171
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
|
2019-08-04 19:04:59 -07:00 |
|
|
PoojawaandGitHub
|
d0d6bc37a6
|
Merge branch 'master' into job-menu-improvements
|
2019-08-02 11:55:28 -05:00 |
|
|
kevinz000andGitHub
|
a82f9c011b
|
Merge pull request #9004 from Trilbyspaceclone/Crafting
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
|
2019-08-02 00:57:05 -07:00 |
|
|
Linzolle
|
bc9bca8d04
|
oh my god
|
2019-08-02 01:20:32 -05:00 |
|
|
Poojawa
|
3499d73f6b
|
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
|
2019-07-31 19:24:39 -05:00 |
|
|
Poojawa
|
218cbe2dbc
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-07-31 19:09:35 -05:00 |
|
|
Ghommie
|
ec560c8371
|
Ports "More robust dorfs."
|
2019-07-31 22:14:39 +02:00 |
|
|
TrilbyspacecloneandGitHub
|
937c809b0b
|
Update action.dm
|
2019-07-31 12:57:10 -04:00 |
|
|
Ghommie
|
ec2a3ea778
|
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
|
2019-07-31 18:56:00 +02:00 |
|
|
Linzolle
|
db198ba217
|
fix leg sweep
|
2019-07-31 01:17:12 -05:00 |
|
|
TrilbySpaceClone
|
7ca32cd97f
|
port 2
|
2019-07-29 07:28:38 -04:00 |
|
|
TrilbySpaceClone
|
606639ce23
|
part 1 fixing shit
|
2019-07-29 05:52:49 -04:00 |
|
|
Fermi
|
d080446a77
|
Merge branch 'pr/20'
|
2019-07-28 23:28:19 +01:00 |
|
|
deathride58
|
a373899ae0
|
[s] fixes major server crash exploit vector involving notes
|
2019-07-28 13:08:02 -04:00 |
|
|
Ghommie
|
78e4c8689b
|
reworked ninja stealth, made ninja shoes completely silent, cleaned up scarily old code.
|
2019-07-28 01:04:19 +02:00 |
|
|
Ghommie
|
72413c893f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
|
2019-07-27 01:38:20 +02:00 |
|
|
Poojawa
|
8c63ea7b6d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-07-26 17:36:46 -05:00 |
|
|
kevinz000
|
d976dd016a
|
Merge remote-tracking branch 'origin/master' into trait_blacklisting
|
2019-07-25 15:20:46 -07:00 |
|
|
Ghommie
|
6623dd4896
|
As if they'd care anyway.
|
2019-07-24 02:03:52 +02:00 |
|
|
Ghommie
|
3bd0ba0275
|
Cleaning up Arousal code & co.
|
2019-07-23 06:39:53 +02:00 |
|
|
kevinz000andGitHub
|
1028fe458a
|
Merge pull request #8909 from Ghommie/Ghommie-cit143
Fixes named arg Knockdown calls.
|
2019-07-22 20:17:30 -07:00 |
|
|
EgoSumStultus
|
4a800e1431
|
blind quirk
|
2019-07-21 23:48:53 -07:00 |
|
|
ThalpyandGitHub
|
15ab1a26a4
|
Merge branch 'master' into master
|
2019-07-21 01:50:41 +01:00 |
|