shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,879 Commits 5 Branches 0 Tags
3af668d69701cadf4db00a5e906a7eed3d5e0924
Commit Graph

664 Commits

Author SHA1 Message Date
LetterJay
4cc0cf3ee7 Merge pull request #3606 from Citadel-Station-13/upstream-merge-31972 
[MIRROR] Greyscale cables
 2017-10-26 16:53:08 -04:00
LetterJay
98ac9f27c8 Merge pull request #3604 from Citadel-Station-13/upstream-merge-32048 
[MIRROR] Adds cogscarab shells and marauder armor into the spawners menu, and tweaks their alerts
 2017-10-26 16:51:53 -04:00
Emmett Gaines
ae86a75362 Greyscale cables 2017-10-25 21:46:57 -05:00
Ashe Higgs
773b44e799 Cogscarab shells/construct chassis on spawn menu (#32048) 2017-10-25 21:45:40 -05:00
Ashe Higgs
dc5f011c48 Fixes being able to stack stargazers on one tile (#32085) 2017-10-25 21:44:29 -05:00
CitadelStationBot
deaec38579 [MIRROR] Fixes shades hearing heartbeats (#3599) 
* Merge pull request #32059 from ShizCalev/shade-heartbeat

Fixes shades hearing heartbeats

* Fixes shades hearing heartbeats
 2017-10-25 20:02:09 -05:00
LetterJay
bb6cbd8528 Merge pull request #3593 from Citadel-Station-13/revert-3584-revert-3580-upstream-merge-31560 
Revert "Revert "[MIRROR] Late join antagonists will try to target late join players""
 2017-10-24 21:30:11 -04:00
LetterJay
e20664dad3 Revert "Revert "[MIRROR] Late join antagonists will try to target late join players"" 2017-10-24 18:18:20 -05:00
KorPhaeron
514533ddaf Ratvar summoning now ends the round/triggers mass proselytize (#31956) 
* Slight changes to ratvar ending

* Tick check

* T

* Why Xhuis?

* Lots of fire

* That src made sense 10 minutes ago but no longer

* More commits than line changes

* Check Tick
 2017-10-24 18:07:06 -05:00
LetterJay
aa420067ba Revert "[MIRROR] Late join antagonists will try to target late join players" 2017-10-24 00:09:11 -05:00
Jordan Brown
94826620fa Late join antagonists will try to target late join players (#31560) 2017-10-23 20:08:43 -05:00
LetterJay
4136be0361 Merge pull request #3558 from Citadel-Station-13/upstream-merge-31978 
[MIRROR] Cleans up datum traitor minimally.
 2017-10-23 14:50:05 -04:00
LetterJay
ce2f1cc672 Merge pull request #3554 from Citadel-Station-13/upstream-merge-31981 
[MIRROR] Removes mob.lastattacked and replaces lastattacker with a string
 2017-10-23 14:48:10 -04:00
LetterJay
4dc2ac3d94 Merge branch 'master' into upstream-merge-31913 2017-10-23 01:25:35 -04:00
AnturK
0faee43f95 Cleans up datum traitor minimally. (#31978) 
* Removes the /custom traitor subtype nonsense.
Fixes borged/ai'zed traitors getting law 0.

* Not needed anymore
 2017-10-22 17:44:55 -05:00
LetterJay
5337b1fed2 Merge pull request #3492 from Citadel-Station-13/upstream-merge-31780 
[MIRROR] Disentangles blob from blob mode/removes blob mode
 2017-10-22 16:39:35 -04:00
vuonojenmustaturska
1794018ae1 Removes mob.lastattacked and replaces lastattacker with a string 2017-10-22 11:29:35 -05:00
LetterJay
000f1c89a3 Merge pull request #3543 from Citadel-Station-13/upstream-merge-31935 
[MIRROR] Fixes shades being sent back to the arrival shuttle when their stone is qdel'd
 2017-10-22 12:25:42 -04:00
LetterJay
dadc96ef98 Update overmind.dm 2017-10-22 10:50:58 -05:00
Jordan Brown
17d2ff88c5 Merge pull request #31935 from ShizCalev/shade-qdel-fix 
Fixes shades being sent back to the arrival shuttle when their stone is qdel'd
 2017-10-21 18:53:50 -05:00
AnturK
ea4fc92dae Fixes wizard roundend with liches around 2017-10-21 16:21:39 -05:00
KorPhaeron
c42e1b17f4 Blob fixes 2017-10-21 14:08:10 -05:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBot
e827f02863 [MIRROR] Fixes various spelling and grammar errors. (#3436) 
* Fixes various spelling and grammar errors.

* Update crashedship.dm

* Update listeningstation.dm

* Update augments_chest.dm

* Update augments_chest.dm
 2017-10-21 07:10:23 -05:00
CitadelStationBot
dd735fb2eb [MIRROR] Makes changelings vomitting acid on things actually leave a puddle of acid (#3522) 
* Changeling vomit (#31878)

* Makes changelings vomitting acid on things actually leave a puddle of acid
 2017-10-21 06:15:06 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
CitadelStationBot
d511bc1fde [MIRROR] Fixes bombs on Reebe being an instant win (#3518) 
* Fixes bombs on Reebe being an instant win (#31503)

* Probably reduces Reebe bombcap

* wat

* TTV warning

* Less awkward wording

* Fixes bombs on Reebe being an instant win
 2017-10-21 03:47:07 -05:00
CitadelStationBot
0ad6e36727 [MIRROR] Apprentice fixes (#3533) 
* Apprentice fixes (#31880)

* Fixes apprentices summoning for non-wizards

* Fixes admin antaghud not showing for solo wizards

* Apprentice fixes
 2017-10-21 03:44:21 -05:00
LetterJay
b7c8330761 Update blob_report.dm 2017-10-20 09:33:39 -05:00
LetterJay
02f0c1573a Merge pull request #3491 from Citadel-Station-13/upstream-merge-31851 
[MIRROR] Fixes liches not blocking roundend properly.
 2017-10-19 09:08:25 -04:00
KorPhaeron
20b17eceec Disentangles blob from blob mode/removes blob mode 2017-10-18 20:55:42 -05:00
AnturK
daeffc5b03 Fixes liches not blocking roundend properly. (#31851) 2017-10-18 18:27:14 -05:00
Robustin
1945f16dee Bad Argument Runtime Removed 2017-10-18 11:56:09 -05:00
LetterJay
250f55e072 Merge pull request #3477 from Citadel-Station-13/upstream-merge-31630 
[MIRROR] Datum rev & related upgrades to base datum antag
 2017-10-18 07:42:54 -04:00
LetterJay
92fa0ca960 Merge pull request #3473 from Citadel-Station-13/upstream-merge-31809 
[MIRROR] Cleans up some istypes not using helpers
 2017-10-18 07:37:43 -04:00
AnturK
2ecb4c216c Datum rev & related upgrades to base datum antag 2017-10-18 02:26:11 -05:00
Leo
28656d3347 Merge pull request #31809 from ShizCalev/helper-cleanup 
Cleans up some istypes not using helpers
 2017-10-17 19:21:14 -05:00
Leo
88486f97ca Merge pull request #31795 from AnturK/random-runtimes 
Random runtime fixes.
 2017-10-17 09:20:55 -05:00
vuonojenmustaturska
4ef21cc841 Makes player-controlled minebots a target for ocular wardens (#31757) 
* Makes player-controlled minebots a target for ocular wardens

* popularity reorder
 2017-10-16 16:48:29 -05:00
LetterJay
568ed91f28 Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599 
[MIRROR] Moves projectile processing to a subsystem
 2017-10-16 10:39:41 -04:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
Jordan Brown
3d50fec086 Merge pull request #31714 from DaxDupont/screaminginternally 
Fixes "permenant" and "permenantly" typos in code/comments.
 2017-10-15 11:32:13 -05:00
LetterJay
b6f69c88ea Merge pull request #3402 from Citadel-Station-13/upstream-merge-31553 
[MIRROR] Removes a bunch of sleeps/spawns and makes a few booleans defines
 2017-10-15 10:22:59 -04:00
LetterJay
f4753de219 Update gland.dm 2017-10-15 07:00:28 -05:00
kevinz000
b20e5916ea Removes a bunch of sleeps/spawns and makes a few booleans defines 2017-10-14 18:53:48 -05:00
Emmett Gaines
24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
LetterJay
0ee34c7b3d Merge pull request #3383 from Citadel-Station-13/upstream-merge-31662 
[MIRROR] Removes unused list
 2017-10-14 15:41:09 -04:00
LetterJay
d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
AnturK
f6f114af12 Removes unused list (#31662) 2017-10-14 00:50:35 -05:00
Jordan Brown
bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00