 kevinz000andGitHub
|
d3555d6782
|
Merge pull request #8243 from Trilbyspaceclone/meteor
More Meteor defenses
|
2019-06-16 01:01:43 -07:00 |
|
|
deathride58andGitHub
|
88a8db87c2
|
Merge pull request #8612 from BlackMajor/Ooga
Makes a small adjustment to the ash walker camp.
|
2019-06-15 21:29:55 -04:00 |
|
|
LetterJayandGitHub
|
0a144545c5
|
Merge pull request #8625 from Trilbyspaceclone/Donator-1
Blue Kimono for SFox63 - Donator
|
2019-06-14 21:18:28 -05:00 |
|
|
CitadelStationBot
|
c43d96e21c
|
Automatic changelog generation for PR #8611 [ci skip]
|
2019-06-14 19:50:07 -05:00 |
|
|
deathride58andGitHub
|
fdc0e4f957
|
Merge pull request #8611 from Poojawa/digitigrade-socks
Digitigrade socks
|
2019-06-14 20:50:05 -04:00 |
|
|
deathride58andGitHub
|
b1f1b2a57d
|
Merge pull request #8609 from Poojawa/simple_mob_nomming-I-guess
Client check to possibly fix #8542
|
2019-06-14 20:49:28 -04:00 |
|
|
CitadelStationBot
|
0d5c54b1b7
|
Automatic changelog generation for PR #8634 [ci skip]
|
2019-06-14 19:44:21 -05:00 |
|
|
deathride58andGitHub
|
d79a58b3f4
|
Merge pull request #8634 from Ghommie/Ghommie-cit46
fixes low-charge stunbatons & co.
|
2019-06-14 20:44:19 -04:00 |
|
|
Ghommie
|
a3c2ed0b52
|
fixes.
|
2019-06-15 02:19:57 +02:00 |
|
|
deathride58andGitHub
|
2f47fbdd8b
|
Merge pull request #8628 from BlackMajor/Pie
Cream Pies now transfer a portion of their reagents on hitting someone
|
2019-06-14 19:18:12 -04:00 |
|
|
CitadelStationBot
|
48b4156fb6
|
Automatic changelog generation for PR #8633 [ci skip]
|
2019-06-14 18:08:52 -05:00 |
|
|
deathride58andGitHub
|
fc332880c4
|
Merge pull request #8633 from Arturlang/Atmos_Updates
Examine text for pumps and typo fixes.
|
2019-06-14 19:08:50 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
f32291146b
|
Update all_nodes.dm
|
2019-06-14 12:02:55 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
c5e3010cfa
|
Update misc_designs.dm
|
2019-06-14 12:01:52 -04:00 |
|
|
CitadelStationBot
|
7433293a3e
|
Automatic changelog generation for PR #8624 [ci skip]
|
2019-06-14 10:53:05 -05:00 |
|
|
kevinz000andGitHub
|
6fdb0670ee
|
Merge pull request #8624 from Arturlang/Fix_High_Alarm_ERT_Suit
[READY] Fixes High Alert ERT suits
|
2019-06-14 08:53:02 -07:00 |
|
|
ArturlangandGitHub
|
fb150c355e
|
Merge pull request #1 from Arturlang/master
hopefully this works to fix travis
|
2019-06-14 11:47:14 +03: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 |
|
|
kevinz000andGitHub
|
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 |
|
|
Arturlang
|
44be4ea7b4
|
Reviewers suggestions
|
2019-06-12 23:58:54 +03: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 |
|
|
BlackMajor
|
142d62908f
|
Actually make it 15, the pie starts with 13u already used
|
2019-06-12 21:18:56 +12:00 |
|
|
BlackMajor
|
7b79bbcb29
|
Changes transfer amount to 10u instead of the full 80
|
2019-06-12 21:17:31 +12:00 |
|
|
BlackMajor
|
90e572ec03
|
Honk
|
2019-06-12 20:03:17 +12:00 |
|
|
TrilbyspacecloneandGitHub
|
207b12e47a
|
Update custom_items.dm
|
2019-06-11 19:11:15 -04:00 |
|
|
TrilbySpaseClone
|
7f3e2dd28b
|
Kimono
Adds blue Kimono for SFox63
|
2019-06-11 18:00:08 -04:00 |
|
|
CitadelStationBot
|
d5bfe16c78
|
Automatic changelog generation for PR #8599 [ci skip]
|
2019-06-11 13:13:03 -05:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
unknown
|
21cae7f0ed
|
Fixed
|
2019-06-11 20:18:16 +03:00 |
|
|
unknown
|
355e384ba1
|
Spacing fixes
|
2019-06-11 14:31:27 +03:00 |
|
|
unknown
|
9219401154
|
Doneso
|
2019-06-11 14:24:16 +03:00 |
|
|
TrilbyspacecloneandGitHub
|
a8f40084be
|
Merge pull request #52 from Citadel-Station-13/master
update
|
2019-06-10 20:55:11 -04: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 |
|
|
BlackMajor
|
e90fe8faf1
|
Update lavaland_surface_ash_walker1.dmm
|
2019-06-10 23:50:09 +12:00 |
|