 CitadelStationBot
|
e9cdeec4f6
|
Removes HasProx testing message
|
2017-05-22 22:48:13 -05:00 |
|
|
LetterJayandGitHub
|
3cf30f3a6b
|
Merge pull request #1083 from Citadel-Station-13/upstream-merge-27474
[MIRROR] Plasma cutters will mine further but will go less distance in open air
|
2017-05-22 17:46:02 -05:00 |
|
|
LetterJay
|
e675b3becc
|
var/mine_range
|
2017-05-22 17:35:40 -05:00 |
|
|
LetterJay
|
288c072544
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27474
|
2017-05-22 17:30:31 -05:00 |
|
|
LetterJayandGitHub
|
3f24f033e5
|
Merge pull request #1106 from Citadel-Station-13/upstream-merge-27485
[MIRROR] Prevents wizard from gaining infinite skeletons with a 3-use Necrostone
|
2017-05-22 17:26:09 -05:00 |
|
|
CitadelStationBot
|
2491ef5a7a
|
Automatic changelog generation for PR #1109 [ci skip]
|
2017-05-22 17:25:48 -05:00 |
|
|
LetterJayandGitHub
|
b66b362e4f
|
Merge pull request #1109 from Citadel-Station-13/upstream-merge-27484
[MIRROR] KA Pressure Mods are now a traitor miner item
|
2017-05-22 17:25:47 -05:00 |
|
|
LetterJayandGitHub
|
09780b7dac
|
Merge pull request #1108 from Artemiuz28/Artemiuz28-patch-1
Female masturbation fixes
|
2017-05-22 17:24:00 -05:00 |
|
|
LetterJayandGitHub
|
e178fb4ac6
|
Merge pull request #1111 from Citadel-Station-13/upstream-merge-27500
[MIRROR] Adds extra investigate logs for SM
|
2017-05-22 17:23:18 -05:00 |
|
|
CitadelStationBot
|
5624174cf5
|
Automatic changelog generation for PR #1112 [ci skip]
|
2017-05-22 17:21:10 -05:00 |
|
|
LetterJayandGitHub
|
64f288fda6
|
Merge pull request #1112 from Citadel-Station-13/upstream-merge-27502
[MIRROR] Ripleys will collect all ore in front of them when they move with a clamp and stored ore box
|
2017-05-22 17:21:09 -05:00 |
|
|
LetterJayandGitHub
|
0ea672cdb9
|
Merge pull request #1113 from Citadel-Station-13/upstream-merge-27501
[MIRROR] Mechs now take the correct amount of charge from inserted cells
|
2017-05-22 17:20:53 -05:00 |
|
|
LetterJayandGitHub
|
25c1aa40dd
|
Merge pull request #1079 from Citadel-Station-13/upstream-merge-27450
[MIRROR] Removes the mess added with recalling with a message
|
2017-05-22 17:14:14 -05:00 |
|
|
LetterJayandGitHub
|
953dde99aa
|
Merge pull request #1073 from Citadel-Station-13/upstream-merge-27160
[MIRROR] Two more types of Legion and makes environment_smash levels into defines
|
2017-05-22 17:07:45 -05:00 |
|
|
LetterJay
|
cbae09b538
|
rej cleanup/commit
|
2017-05-22 16:59:39 -05:00 |
|
|
LetterJay
|
aad357bd74
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27450
|
2017-05-22 16:56:18 -05:00 |
|
|
LetterJayandGitHub
|
c56ae0396a
|
Merge pull request #1071 from Citadel-Station-13/upstream-merge-27440
[MIRROR] Merge loadallmaps.dm into basemap.dm
|
2017-05-22 16:30:07 -05:00 |
|
|
LetterJayandGitHub
|
abbacd2c89
|
Merge branch 'master' into upstream-merge-27160
|
2017-05-22 16:29:43 -05:00 |
|
|
LetterJayandGitHub
|
ab50a3eca5
|
Merge pull request #1068 from Citadel-Station-13/upstream-merge-27283
[MIRROR] Decentralized and Vastly Improved Gang Influence System
|
2017-05-22 16:28:57 -05:00 |
|
|
LetterJayandGitHub
|
e7caee1af7
|
Merge pull request #1065 from Citadel-Station-13/upstream-merge-27379
[MIRROR] Proto-kinetic crushers are significantly better
|
2017-05-22 16:28:00 -05:00 |
|
|
LetterJayandGitHub
|
c414bcd26e
|
Update equipment.dm
|
2017-05-22 13:13:16 -05:00 |
|
|
LetterJayandGitHub
|
3f62929340
|
Merge branch 'master' into upstream-merge-27379
|
2017-05-22 12:45:18 -05:00 |
|
|
LetterJayandGitHub
|
9df8057e0e
|
Merge pull request #1050 from Citadel-Station-13/upstream-merge-27344
[MIRROR] Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
|
2017-05-22 12:40:18 -05:00 |
|
|
LetterJayandGitHub
|
8791ad036f
|
Merge pull request #1045 from Citadel-Station-13/upstream-merge-27268
[MIRROR] World.dm Refactor
|
2017-05-22 12:39:52 -05:00 |
|
|
LetterJay
|
e0f65beb37
|
World > SSticker
|
2017-05-22 12:31:05 -05:00 |
|
|
LetterJay
|
3548ed5e3e
|
i'll fix this in another PR
|
2017-05-22 12:27:59 -05:00 |
|
|
LetterJay
|
d1db0044d1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344
|
2017-05-22 11:52:18 -05:00 |
|
|
CitadelStationBot
|
f860fce04e
|
Mechs now take the correct amount of charge from inserted cells
|
2017-05-22 11:45:59 -05:00 |
|
|
CitadelStationBot
|
7a57898886
|
Ripleys will collect all ore in front of them when they move with a clamp and stored ore box
|
2017-05-22 11:44:54 -05:00 |
|
|
CitadelStationBot
|
84e30c6824
|
Adds extra investigate logs for SM
|
2017-05-22 11:36:40 -05:00 |
|
|
LetterJayandGitHub
|
65c24a5fde
|
Merge branch 'master' into upstream-merge-27440
|
2017-05-22 11:33:55 -05:00 |
|
|
LetterJay
|
f550e8032c
|
rej/dme cleanup
|
2017-05-22 11:32:12 -05:00 |
|
|
LetterJay
|
d200bff9f4
|
spaces. spaces caused the file to conflict.
|
2017-05-22 11:26:47 -05:00 |
|
|
LetterJay
|
73dea85b15
|
commit/rej cleanup
|
2017-05-22 11:24:17 -05:00 |
|
|
LetterJayandGitHub
|
1d8f9b31ee
|
Merge pull request #1095 from Citadel-Station-13/upstream-merge-27466
[MIRROR] Fixes talisman grammar
|
2017-05-22 08:25:42 -05:00 |
|
|
CitadelStationBot
|
fad23e47f6
|
Automatic changelog generation for PR #1094 [ci skip]
|
2017-05-22 08:25:32 -05:00 |
|
|
LetterJayandGitHub
|
b2a0fe64af
|
Merge pull request #1094 from Citadel-Station-13/upstream-merge-27488
[MIRROR] Fixes jetpacks working indoors/in areas with gravity
|
2017-05-22 08:25:30 -05:00 |
|
|
LetterJayandGitHub
|
8572dc2da8
|
Merge pull request #1093 from Citadel-Station-13/upstream-merge-27396
[MIRROR] Since you can properly scrub Freon now, it doesn't destroy itself.
|
2017-05-22 08:25:13 -05:00 |
|
|
LetterJayandGitHub
|
ef69582c52
|
Merge pull request #1090 from Citadel-Station-13/upstream-merge-27472
[MIRROR] Minor Grammar Fixes
|
2017-05-22 08:24:41 -05:00 |
|
|
LetterJayandGitHub
|
a345c41bcd
|
Merge pull request #1089 from Citadel-Station-13/upstream-merge-27473
[MIRROR] Nerfs monkeys
|
2017-05-22 08:24:26 -05:00 |
|
|
LetterJayandGitHub
|
85e03b3e11
|
Merge pull request #1088 from Citadel-Station-13/upstream-merge-27430
[MIRROR] Fixes pkborg fields not updating location or draining power
|
2017-05-22 08:24:08 -05:00 |
|
|
CitadelStationBot
|
78b85984f8
|
Automatic changelog generation for PR #1086 [ci skip]
|
2017-05-22 08:23:25 -05:00 |
|
|
LetterJayandGitHub
|
a0e5170e40
|
Merge pull request #1086 from Citadel-Station-13/upstream-merge-27476
[MIRROR] Megafauna and lavaland mobs will no longer spawn directly on top of the mining base
|
2017-05-22 08:23:23 -05:00 |
|
|
LetterJayandGitHub
|
d016d5b669
|
Merge pull request #1085 from Citadel-Station-13/upstream-merge-27519
[MIRROR] Fixes Master/Recover not restoring previous runlevel
|
2017-05-22 08:23:05 -05:00 |
|
|
LetterJayandGitHub
|
d0cd9fc408
|
Merge pull request #1082 from Citadel-Station-13/upstream-merge-27481
[MIRROR] Fixes paper runtimes
|
2017-05-22 08:22:46 -05:00 |
|
|
CitadelStationBot
|
9e2d43fd80
|
KA Pressure Mods are now a traitor miner item
|
2017-05-22 08:20:07 -05:00 |
|
|
Artemiuz28andGitHub
|
ceed94e67f
|
Fixed femcum creating decal with semen reagent
|
2017-05-22 16:12:20 +03:00 |
|
|
Artemiuz28andGitHub
|
c6e60fcc76
|
Vagina is now valid for masturbation
|
2017-05-22 16:11:07 +03:00 |
|
|
Artemiuz28andGitHub
|
f0ed647ef4
|
Update womb.dm
|
2017-05-22 16:03:45 +03:00 |
|
|
CitadelStationBot
|
2dc68a5ebf
|
Prevents wizard from gaining infinite skeletons with a 3-use Necrostone
|
2017-05-22 07:28:48 -05:00 |
|