LetterJay
|
09780b7dac
|
Merge pull request #1108 from Artemiuz28/Artemiuz28-patch-1
Female masturbation fixes
|
2017-05-22 17:24:00 -05:00 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
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 |
|
LetterJay
|
abbacd2c89
|
Merge branch 'master' into upstream-merge-27160
|
2017-05-22 16:29:43 -05:00 |
|
LetterJay
|
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 |
|
LetterJay
|
c414bcd26e
|
Update equipment.dm
|
2017-05-22 13:13:16 -05:00 |
|
LetterJay
|
3f62929340
|
Merge branch 'master' into upstream-merge-27379
|
2017-05-22 12:45:18 -05:00 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
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 |
|
CitadelStationBot
|
4533d31e34
|
Cult Fixes for Construct Icons and Spells
|
2017-05-22 10:49:33 -05:00 |
|
LetterJay
|
1d8f9b31ee
|
Merge pull request #1095 from Citadel-Station-13/upstream-merge-27466
[MIRROR] Fixes talisman grammar
|
2017-05-22 08:25:42 -05:00 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
ef69582c52
|
Merge pull request #1090 from Citadel-Station-13/upstream-merge-27472
[MIRROR] Minor Grammar Fixes
|
2017-05-22 08:24:41 -05:00 |
|
LetterJay
|
a345c41bcd
|
Merge pull request #1089 from Citadel-Station-13/upstream-merge-27473
[MIRROR] Nerfs monkeys
|
2017-05-22 08:24:26 -05:00 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
CitadelStationBot
|
9e2d43fd80
|
KA Pressure Mods are now a traitor miner item
|
2017-05-22 08:20:07 -05:00 |
|
Artemiuz28
|
ceed94e67f
|
Fixed femcum creating decal with semen reagent
|
2017-05-22 16:12:20 +03:00 |
|
Artemiuz28
|
c6e60fcc76
|
Vagina is now valid for masturbation
|
2017-05-22 16:11:07 +03:00 |
|
Artemiuz28
|
f0ed647ef4
|
Update womb.dm
|
2017-05-22 16:03:45 +03:00 |
|
CitadelStationBot
|
070ee9b86a
|
Fixes shooting out of view windows
|
2017-05-22 07:44:10 -05:00 |
|
CitadelStationBot
|
2dc68a5ebf
|
Prevents wizard from gaining infinite skeletons with a 3-use Necrostone
|
2017-05-22 07:28:48 -05:00 |
|
CitadelStationBot
|
dc31873c3a
|
fixes being able to transfer into golem shells after they're already taken and sending people into nullspace as a result.
|
2017-05-22 07:27:43 -05:00 |
|
CitadelStationBot
|
ebca1eb051
|
A silicon will always be able to speak Galactic Common
|
2017-05-22 07:26:31 -05:00 |
|
CitadelStationBot
|
25df88509a
|
Reorganizes martial arts and stores them in the MIND.
|
2017-05-22 07:13:10 -05:00 |
|
CitadelStationBot
|
2617011eb5
|
Having less legs won't slow you down if you're in zero gravity with a jetpack
|
2017-05-22 07:08:59 -05:00 |
|
CitadelStationBot
|
20dd169998
|
Fixes ordering of text2file params
|
2017-05-21 22:29:19 -05:00 |
|
CitadelStationBot
|
73aa9346e3
|
Fixes built air meters not working
|
2017-05-21 22:29:15 -05:00 |
|
CitadelStationBot
|
8bc4cf3f41
|
Warden Compact Combat Shotgun
|
2017-05-21 22:29:01 -05:00 |
|
CitadelStationBot
|
39635b2d0d
|
Fixes talisman grammar
|
2017-05-21 22:28:57 -05:00 |
|
CitadelStationBot
|
9f75c7b317
|
Fixes jetpacks working indoors/in areas with gravity
|
2017-05-21 22:28:51 -05:00 |
|
CitadelStationBot
|
f132720d7e
|
Since you can properly scrub Freon now, it doesn't destroy itself.
|
2017-05-21 22:28:47 -05:00 |
|
CitadelStationBot
|
8abbf12132
|
Resonator fields now visually show how long they have until they burst
|
2017-05-21 22:28:36 -05:00 |
|
CitadelStationBot
|
7df5632d6e
|
Minor Grammar Fixes
|
2017-05-21 22:28:29 -05:00 |
|
CitadelStationBot
|
31ecd3cdd8
|
Nerfs monkeys
|
2017-05-21 22:28:25 -05:00 |
|
CitadelStationBot
|
1dcad5fa0e
|
Fixes pkborg fields not updating location or draining power
|
2017-05-21 22:28:20 -05:00 |
|