shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,301 Commits 5 Branches 0 Tags
5a331eedad2cd31752ff9ad59ae78f6af2e64e70
Commit Graph

747 Commits

Author SHA1 Message Date
deathride58
2e210d08e1 Merge pull request #3639 from deathride58/IHAVENOIDEAWHATTHEFUCKIMDOING 
[READY] Redtext bug fix + Endround objective check cleanup
 2017-11-21 05:53:00 +00:00
deathride58
d2b251d23c Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844 
[MIRROR] Cleans up unused code
 2017-11-21 04:15:11 +00:00
AnturK
70c7996986 Fixes abductor teams getting assigned to same pod (#32859) 
* Fixes abductors getting assigned to same team

* Remove explicit null return
 2017-11-20 19:36:10 -06:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
deathride58
c2864b3b8b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into IHAVENOIDEAWHATTHEFUCKIMDOING 2017-11-20 00:21:38 -05:00
KorPhaeron
47b9cc2051 Fixes suicidal blobbernauts (#32851) 
* Fixes suicidal blobbernauts

* Removes notransform
 2017-11-18 18:37:50 -06:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
LetterJay
286442cf4a Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183 
[MIRROR] Ling datum antag standarization.
 2017-11-15 15:00:46 -06:00
LetterJay
a8d73f8ec2 Merge pull request #3948 from Citadel-Station-13/upstream-merge-32726 
[MIRROR] Removes some attackby crowbar checks on nuclear bombs and camera assemblies
 2017-11-15 10:51:04 -06:00
LetterJay
163ef812fb Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702 
[MIRROR] Minor speedups to movement: First Blood Part 2
 2017-11-15 10:41:16 -06:00
LetterJay
1939e96bb6 Merge branch 'master' into upstream-merge-32183 2017-11-15 10:22:40 -06:00
Leo
4d1ea753c3 Removes some attackby crowbar checks on nuclear bombs and camera assemblies (#32726) 2017-11-14 17:44:49 -06:00
LetterJay
528255833f Merge pull request #3935 from Citadel-Station-13/upstream-merge-32684 
[MIRROR] Fix the station integrity report to read the correct Z
 2017-11-14 15:54:44 -06:00
vuonojenmustaturska
8136148303 Minor speedups to movement: First Blood Part 2 2017-11-14 15:00:45 -06:00
Tad Hardesty
aa8581d430 Fix the station integrity report to read the correct Z 
Fixes a bug where the integrity of CentCom was being taken instead,
coming out at about 85% no matter what happened during the round. Also
removes the gang territory calculation now that it isn't used anywhere.
 2017-11-14 12:45:47 -06:00
Robustin
bd0cbee581 Cult pop scaling refactor (#32598) 2017-11-14 07:44:28 -06:00
LetterJay
0d65074f44 Merge pull request #3899 from Citadel-Station-13/upstream-merge-32635 
[MIRROR] Fixes fleeing the station message accuracy
 2017-11-13 11:44:16 -06:00
LetterJay
14944d8711 Merge branch 'master' into upstream-merge-32183 2017-11-12 23:09:55 -06:00
LetterJay
3ea8808201 Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161 
[MIRROR] 512 forward compatibility merge
 2017-11-12 23:06:55 -06:00
Leo
8814c55bfb Merge pull request #32635 from AnturK/cowardsallofthem 
Fixes fleeing the station message accuracy
 2017-11-12 11:40:57 -06:00
LetterJay
7eccc3b2db Merge pull request #3875 from Citadel-Station-13/upstream-merge-32445 
[MIRROR] ok now i kinda tested the ark examine
 2017-11-12 08:19:30 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LetterJay
e28a6eb82a Merge pull request #3890 from Citadel-Station-13/upstream-merge-32578 
[MIRROR] Fixes AIs being unable to place robotics factories
 2017-11-11 15:56:22 -06:00
LetterJay
5cf5625568 Update airlock_maker.dm 2017-11-11 15:54:38 -06:00
Leo
6993018d9f Merge pull request #32578 from YPOQ/factoryfix 
Fixes AIs being unable to place robotics factories
 2017-11-11 14:31:54 -06:00
Jordan Brown
bd88488c39 Updates the clockwork slab description (#32610) 
* Updates the clockwork slab description

* Adds period to the end of clockwork slab description
 2017-11-11 14:31:21 -06:00
LetterJay
a3ba99a7e8 Merge pull request #3869 from Citadel-Station-13/upstream-merge-32531 
[MIRROR] Fixes word crimes
 2017-11-11 12:37:43 -06:00
MoreRobustThanYou
ecf49cd0a0 ok now i kinda tested the ark examine (#32445) 
* No, I did NOT test the Ark examine.

* Update countdown.dm

* Update ark_of_the_clockwork_justicar.dm

* Update ark_of_the_clockwork_justicar.dm

* OK JOAN FIXED

* Update ark_of_the_clockwork_justicar.dm
 2017-11-09 20:57:39 -06:00
swindly
3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
Blute1
e6031b0d5c Process_Spacemove proc improvement 2017-11-08 19:51:57 -06:00
LetterJay
db65ced87d Merge pull request #3848 from Citadel-Station-13/upstream-merge-32446 
[MIRROR] Xenobio blobbernauts can no longer walk on blob tiles
 2017-11-08 01:45:28 -06:00
MoreRobustThanYou
4b7970f4f7 Xenobio blobbernauts can no longer walk on blob tiles (#32446) 2017-11-07 10:30:21 -06:00
Ashe Higgs
577d1b7d20 Marauder balancing pass (#32448) 2017-11-07 09:57:26 -06:00
LetterJay
3115e59b7e Merge pull request #3827 from Citadel-Station-13/upstream-merge-32133 
[MIRROR] Blobbernauts and spores are no longer killed by blob victory
 2017-11-07 04:43:17 -06:00
LetterJay
0256aa8881 Merge pull request #3826 from Citadel-Station-13/upstream-merge-32359 
[MIRROR] fixes cult hardsuit size
 2017-11-07 04:43:02 -06:00
LetterJay
e420734e3a Merge pull request #3819 from Citadel-Station-13/upstream-merge-32397 
[MIRROR] Fixes Ark examine
 2017-11-07 04:40:48 -06:00
LetterJay
f45515eaee Update transform.dm 2017-11-07 03:28:38 -06:00
LetterJay
a60582c37e Update revive.dm 2017-11-07 03:28:25 -06:00
LetterJay
4b676044f2 Update mimic_voice.dm 2017-11-07 03:28:14 -06:00
LetterJay
bfecaaaac0 Update humanform.dm 2017-11-07 03:28:05 -06:00
LetterJay
c593d25ae2 Update hivemind.dm 2017-11-07 03:27:48 -06:00
LetterJay
8daeb7bb75 Update fakedeath.dm 2017-11-07 03:27:37 -06:00
AnturK
2e0aaf8598 Ling datum antag standarization. 2017-11-05 19:32:59 -06:00
MoreRobustThanYou
9cdf151a60 Blobbernauts and spores are no longer killed by blob victory (#32133) 
* Blobbernauts and spores are no longer killed by blob victory

* Update overmind.dm

* Update overmind.dm

* Update overmind.dm

* Update overmind.dm
 2017-11-05 12:07:12 -06:00
imsxz
705ade984a Make cult hardsuit bulky sized (#32359) 2017-11-05 12:05:01 -06:00
MoreRobustThanYou
0f5f748bf5 Fixes Ark examine (#32397) 
* Fixes Ark examine

Fixes my own problem!

* WOOPS

* Update ark_of_the_clockwork_justicar.dm

* SECONDS!

* That looks a bit cleaner tbh

* Update ark_of_the_clockwork_justicar.dm

* Update ark_of_the_clockwork_justicar.dm
 2017-11-05 02:11:06 -06:00
Emmett Gaines
5bcc90d3c1 removes search_contents_for proc (#32411) 2017-11-05 02:07:16 -06:00
LetterJay
c0293df7e0 Merge pull request #3794 from Citadel-Station-13/upstream-merge-32339 
[MIRROR] You can no longer disturb the floor with visions of madness
 2017-11-04 22:48:50 -05:00
LetterJay
c472b92fd1 Merge pull request #3780 from Citadel-Station-13/upstream-merge-32356 
[MIRROR] Redtexting as a traitor now gets you some depressing music played to you
 2017-11-04 22:41:30 -05:00
LetterJay
f6d9f3411c Merge pull request #3779 from Citadel-Station-13/upstream-merge-32355 
[MIRROR] Prints out cultist names at round end
 2017-11-04 22:40:58 -05:00