shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,942 Commits 5 Branches 0 Tags
558a989d8a957504ea3fe0e1a5b3f21ba34e8597
Commit Graph

12374 Commits

Author SHA1 Message Date
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
kevinz000
ff4ef6a1f5 reset 2017-05-21 21:58:11 -07:00
kevinz000
0bf9f163f3 missed a spot 2017-05-21 21:54:31 -07:00
CitadelStationBot
db4b764aea [All stations] Cleaned up var-editted areas 2017-05-21 22:29:41 -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
CitadelStationBot
d7f0b9494b Ports pandemic to tgui 2017-05-21 22:28:16 -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
4acbd4af2c Fixes Master/Recover not restoring previous runlevel 2017-05-21 22:27:58 -05:00
CitadelStationBot
1989e3d5ea properly fixes quickgrab exploit 2017-05-21 22:27:54 -05:00
CitadelStationBot
f43a861d6e Plasma cutters will mine further but will go less distance in open air 2017-05-21 22:27:50 -05:00
CitadelStationBot
a33966b231 Fixes paper runtimes 2017-05-21 22:27:46 -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
CitadelStationBot
312ae2218e [MIRROR] fixes chameleon laser guns blowing up welding tanks for real this time (#1069) 
* fixes chameleon laser guns blowing up welding tanks for real this time

* Delete energy.dm.rej

* Update energy.dm
 2017-05-21 18:30:12 -07:00
kevinz000
de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items 
# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm
 2017-05-21 18:17:42 -07:00
kevinz000
7e2cebe1db Merge branch 'master' into upstream-merge-27344 2017-05-21 17:50:29 -07:00
CitadelStationBot
0924db6d41 Re-removes "the station" from drone law 3 (#1075) 2017-05-21 17:45:06 -07:00
CitadelStationBot
cd82124ef5 Survival pod doors will properly turn if on shuttles (#1070) 2017-05-21 17:43:53 -07:00
CitadelStationBot
a3807448db Adds framework for kinetic accelerator projectiles having module-based effects on-hit (#1076) 2017-05-21 17:42:06 -07:00
CitadelStationBot
3ad9c0ffed fixes cults being able to delete people (#1077) 2017-05-21 12:47:10 -07:00
CitadelStationBot
26448d7016 Removes the mess added with recalling with a message 2017-05-21 07:57:17 -05:00
CitadelStationBot
e224a47f53 Two more types of Legion and makes environment_smash levels into defines 2017-05-21 02:52:23 -05:00
CitadelStationBot
c0da458c92 Ports folders to Initialize (#1058) 2017-05-21 01:22:53 -05:00
Poojawa
2be5022536 Merge branch 'master' into upstream-merge-27268 2017-05-21 01:22:16 -05:00
Poojawa
909be8c8c7 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27344 2017-05-21 01:10:53 -05:00
CitadelStationBot
c8e9e34d2b [MIRROR] Fixes stat gathering (#1025) 
* Fixes stat gathering

* Delete blackbox.dm.rej

* Update blackbox.dm
 2017-05-21 01:07:14 -05:00
Poojawa
7a3fb9e62e update ticker.dm 2017-05-21 01:05:10 -05:00
Poojawa
110de7902e Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 2017-05-21 01:01:11 -05:00
Poojawa
a8fa82b7c6 update world.dm 2017-05-21 01:01:10 -05:00
CitadelStationBot
883c5e034d Fixes bootstrapping the feedback database (#1012) 2017-05-21 00:46:44 -05:00