CitadelStationBot
|
60f1e4348a
|
Chasms will glow dimly, like lava
|
2017-05-22 22:11:53 -05:00 |
|
CitadelStationBot
|
4ac787e3bb
|
Adds a toy weapon vendor into the syndie lavaland base firing range
|
2017-05-22 22:10:47 -05:00 |
|
CitadelStationBot
|
efa9de6da9
|
Area Refactor + Var-edit Cleanup
|
2017-05-22 22:08:35 -05:00 |
|
LetterJay
|
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 |
|
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
|
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
|
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
|
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 |
|
LetterJay
|
d200bff9f4
|
spaces. spaces caused the file to conflict.
|
2017-05-22 11:26:47 -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
|
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
|
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
|
25df88509a
|
Reorganizes martial arts and stores them in the MIND.
|
2017-05-22 07:13:10 -05:00 |
|
CitadelStationBot
|
db4b764aea
|
[All stations] Cleaned up var-editted areas
|
2017-05-21 22:29:41 -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
|
1dcad5fa0e
|
Fixes pkborg fields not updating location or draining power
|
2017-05-21 22:28:20 -05:00 |
|
CitadelStationBot
|
4e5617ad54
|
Megafauna and lavaland mobs will no longer spawn directly on top of the mining base
|
2017-05-21 22:28:10 -05:00 |
|
CitadelStationBot
|
5fd5e32628
|
[MIRROR] Fixes syndicate borg spawner (#1072)
* Fixes syndicate borg spawner
* Delete antag_spawner.dm.rej
* Update antag_spawner.dm
|
2017-05-21 18:30:28 -07:00 |
|
kevinz000
|
7e2cebe1db
|
Merge branch 'master' into upstream-merge-27344
|
2017-05-21 17:50:29 -07:00 |
|
CitadelStationBot
|
3ad9c0ffed
|
fixes cults being able to delete people (#1077)
|
2017-05-21 12:47:10 -07:00 |
|
CitadelStationBot
|
e224a47f53
|
Two more types of Legion and makes environment_smash levels into defines
|
2017-05-21 02:52:23 -05:00 |
|
Poojawa
|
186ed2acbb
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268
|
2017-05-21 00:44:08 -05:00 |
|
Poojawa
|
f4e7e152df
|
Merge branch 'upstream-merge-27344' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344
|
2017-05-21 00:37:53 -05:00 |
|
Poojawa
|
587bc1795c
|
missing files
|
2017-05-21 00:37:47 -05:00 |
|
Poojawa
|
e28130f70c
|
Update rune_spawn_action.dm
|
2017-05-21 00:23:00 -05:00 |
|
Poojawa
|
45ba084c6a
|
Merge branch 'master' into upstream-merge-27344
|
2017-05-20 23:26:28 -05:00 |
|
CitadelStationBot
|
12bbacec25
|
[MIRROR] Adds framework for cult constructs having the ability to make runes (#1010)
* Adds framework for cult constructs having the ability to make runes
* Delete mobs.dm.rej
* Update runes.dm
* clean .rej
|
2017-05-20 23:12:51 -05:00 |
|
CitadelStationBot
|
88ede32216
|
[MIRROR] Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#994)
* Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition
* Rej cleanup
* update mob.dmi
* Update living_defense.dm
|
2017-05-20 23:00:02 -05:00 |
|
CitadelStationBot
|
c39b60b3cf
|
Decentralized and Vastly Improved Gang Influence System
|
2017-05-20 18:37:48 -05:00 |
|
LetterJay
|
425191a0b6
|
Merge pull request #1054 from Citadel-Station-13/upstream-merge-27384
[MIRROR] Fix choice for golems transferring between shells
|
2017-05-19 09:05:38 -04:00 |
|
LetterJay
|
20848789f0
|
Merge pull request #1055 from Citadel-Station-13/upstream-merge-27376
[MIRROR] If ratvar is alive, turning clockwork floors into clockwork walls is fast
|
2017-05-19 09:05:03 -04:00 |
|
CitadelStationBot
|
c36eee94bd
|
Adds modified syringe guns
|
2017-05-19 06:25:23 -05:00 |
|
CitadelStationBot
|
b943780a8c
|
If ratvar is alive, turning clockwork floors into clockwork walls is fast
|
2017-05-19 06:25:19 -05:00 |
|
CitadelStationBot
|
a56d1fcb9b
|
Fix choice for golems transferring between shells
|
2017-05-19 06:21:10 -05:00 |
|
LetterJay
|
cb5e0eba3a
|
Merge pull request #1039 from Citadel-Station-13/upstream-merge-27367
[MIRROR] Quick fix for AI language issues.
|
2017-05-19 01:00:41 -04:00 |
|
LetterJay
|
96710c56e1
|
Merge pull request #1046 from Citadel-Station-13/upstream-merge-27292
[MIRROR] Fixes clicking things under windows/doors.
|
2017-05-18 23:46:08 -04:00 |
|
LetterJay
|
369edc07d2
|
Merge pull request #1044 from Citadel-Station-13/upstream-merge-27347
[MIRROR] fixes ratvar shuttles
|
2017-05-18 23:45:31 -04:00 |
|
LetterJay
|
6abf2a53be
|
Merge pull request #1041 from Citadel-Station-13/upstream-merge-27359
[MIRROR] Plastic explosives can no longer be detonated by EMPs
|
2017-05-18 23:44:53 -04:00 |
|