 Ghommie
|
a3c2ed0b52
|
fixes.
|
2019-06-15 02:19:57 +02:00 |
|
|
Ghommie
|
adaa5840c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit46
|
2019-06-13 23:18:22 +02:00 |
|
|
kevinz000
|
35e280b058
|
Merge pull request #8641 from Ghommie/Ghommie-cit47
port "PR to make travis use xenial and to make it work"
|
2019-06-13 14:14:35 -07:00 |
|
|
Ghommie
|
84bb5d90ce
|
newlines.
|
2019-06-13 22:54:41 +02:00 |
|
|
Ghommie
|
27b7010181
|
Proof of my asinine acts.
|
2019-06-13 22:52:12 +02:00 |
|
|
Ghommie
|
0206a534b0
|
add in spaces.
|
2019-06-13 22:20:47 +02:00 |
|
|
Ghommie
|
c37c432de6
|
port "PR to make travis use xenial and to make it work"
|
2019-06-13 22:18:13 +02:00 |
|
|
Ghommie
|
e2bf5b73fd
|
I'm being too careless, sorry for the many commits.
|
2019-06-12 23:22:31 +02:00 |
|
|
Ghommie
|
7a8eaf41ac
|
another get_cell()
|
2019-06-12 23:21:42 +02:00 |
|
|
Ghommie
|
5ba46eb517
|
Avoid runtiming.
|
2019-06-12 23:20:34 +02:00 |
|
|
Ghommie
|
2edef99b08
|
.
|
2019-06-12 23:16:27 +02:00 |
|
|
Ghommie
|
a29095cbe1
|
Penitence for the awful mistakes I have done in the refactor.
|
2019-06-12 23:06:09 +02:00 |
|
|
Ghommie
|
5a35e95735
|
.
|
2019-06-12 22:52:05 +02:00 |
|
|
Ghommie
|
4cc7636da1
|
fixing more.
|
2019-06-12 22:50:09 +02:00 |
|
|
Ghommie
|
368267f53d
|
dddddd
|
2019-06-12 20:31:24 +02:00 |
|
|
Ghommie
|
516b71ed7e
|
fixing stunbatons.
|
2019-06-12 20:13:08 +02:00 |
|
|
CitadelStationBot
|
d5bfe16c78
|
Automatic changelog generation for PR #8599 [ci skip]
|
2019-06-11 13:13:03 -05:00 |
|
|
kevinz000
|
54b3568319
|
Merge pull request #8599 from Poojawa/pacifistic-vore
Pacifists can nom things now, but not feed to others
|
2019-06-11 11:13:01 -07:00 |
|
|
kevinz000
|
d2b40ea73d
|
Merge pull request #8610 from Sishen1542/fingerlessinsuls
Changes assistant family heirloom to a pair of fingerless insulated gloves
|
2019-06-11 11:03:56 -07:00 |
|
|
CitadelStationBot
|
5b90fa4d04
|
Automatic changelog generation for PR #8587 [ci skip]
|
2019-06-11 12:56:46 -05:00 |
|
|
kevinz000
|
6ead9bbe65
|
Merge pull request #8587 from SkullyRoberts/DickImplant
Added a single use penis autosurgeon as rare maint loot. Because why the hell not?
|
2019-06-11 10:56:44 -07:00 |
|
|
Sishen
|
13853ac6bf
|
removes family gavel, readds briefcase
|
2019-06-10 10:16:32 -04:00 |
|
|
Sishen
|
400ad0b03b
|
added family gavel
|
2019-06-10 09:55:23 -04:00 |
|
|
Sishen
|
9f80fbe68b
|
Coloring gloves? Not on my watch!
|
2019-06-10 05:20:54 -04:00 |
|
|
Sishen
|
4eccc12205
|
Why are we here? Just to suffer?
|
2019-06-10 04:56:24 -04:00 |
|
|
CitadelStationBot
|
37f5006a6f
|
Automatic changelog generation for PR #8562 [ci skip]
|
2019-06-10 01:23:44 -05:00 |
|
|
kevinz000
|
5f3e0f4f5e
|
Merge pull request #8562 from AnalWerewolf/Fritz-cute
Fritz plushie and donor item
|
2019-06-09 23:23:42 -07:00 |
|
|
AnalWerewolf
|
9154b06ef1
|
update my SHIT
|
2019-06-10 15:20:52 +10:00 |
|
|
AnalWerewolf
|
8337692650
|
Merge branch 'master' into Fritz-cute
|
2019-06-10 15:15:41 +10:00 |
|
|
AnalWerewolf
|
00b3ac23f2
|
changed the opacity of a single fucking pixel
title
|
2019-06-10 14:53:47 +10:00 |
|
|
kevinz000
|
b6d74cd495
|
Merge pull request #8594 from dtfe3/dtfe3-ears-fox
speedmerge or something for this fix or the local fox girls will kill me
|
2019-06-09 10:25:07 -07:00 |
|
|
Poojawa
|
3f1b7e4dd6
|
Pacifists can nom things now, but not feed to others
|
2019-06-09 02:23:53 -05:00 |
|
|
dtfe3
|
6e90ea1171
|
Update mam_ears.dmi
|
2019-06-09 06:20:59 +02:00 |
|
|
deathride58
|
ef733f3eb3
|
Merge pull request #8592 from Citadel-Station-13/kevinz000-patch-48
Fixes master pt 2
|
2019-06-08 22:44:33 -04:00 |
|
|
kevinz000
|
ec9ae5348f
|
Merge remote-tracking branch 'origin/master' into kevinz000-patch-48
|
2019-06-08 19:10:59 -07:00 |
|
|
kevinz000
|
bf431155b7
|
test
|
2019-06-08 18:29:30 -07:00 |
|
|
kevinz000
|
4a6f2d2b5a
|
Merge pull request #8590 from Citadel-Station-13/kevinz000-patch-49
Fixes master - yeah im hitting the merge on this fuck it
|
2019-06-08 18:13:17 -07:00 |
|
|
kevinz000
|
1a07f304c9
|
Update examine.dm
|
2019-06-08 17:32:36 -07:00 |
|
|
kevinz000
|
5cf0a9e67f
|
Update carbon_defense.dm
|
2019-06-08 17:30:50 -07:00 |
|
|
kevinz000
|
7755bf6b0a
|
Merge pull request #8508 from Thalpy/FriendlyEmpathy
Adds traits: Friendly and empathy
|
2019-06-08 17:26:01 -07:00 |
|
|
Thalpy
|
628482e53b
|
Merge branch 'master' into FriendlyEmpathy
|
2019-06-08 23:45:37 +01:00 |
|
|
SkullyRoberts
|
e83365daed
|
Added a penis autosurgeon as rare maint loot
|
2019-06-08 17:12:51 -04:00 |
|
|
CitadelStationBot
|
90d0ce5897
|
Automatic changelog generation for PR #8567 [ci skip]
|
2019-06-08 14:05:28 -05:00 |
|
|
kevinz000
|
543c9c07e2
|
Merge pull request #8567 from Arturlang/RPD-Update
You can now use an RPD on windows and Grilles.
|
2019-06-08 12:05:26 -07:00 |
|
|
CitadelStationBot
|
2288346876
|
Automatic changelog generation for PR #8566 [ci skip]
|
2019-06-08 14:05:19 -05:00 |
|
|
kevinz000
|
be9a551eea
|
Merge pull request #8566 from Ghommie/Ghommie-cit39
Different combat mode message if user is on help intent.
|
2019-06-08 12:05:17 -07:00 |
|
|
Ghommie
|
53d5ad5820
|
no exclamation point.
|
2019-06-08 14:45:26 +02:00 |
|
|
Ghommie
|
fc536dcfe4
|
Urist McSpaceman goes vigilant!
Urist McSpaceman seems attentive!
Urist McSpaceman looks alert!
|
2019-06-08 14:44:40 +02:00 |
|
|
CitadelStationBot
|
b2e964f169
|
Automatic changelog generation for PR #8514 [ci skip]
|
2019-06-08 05:53:15 -05:00 |
|
|
kevinz000
|
b69986e544
|
Merge pull request #8514 from BurgerLUA/Arcade-Loot-Improvements
Arcade Loot Improvements + Battlemachine Tweaks
|
2019-06-08 03:53:13 -07:00 |
|