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

2106 Commits

Author SHA1 Message Date
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
40c2a8d40b Merge pull request #3592 from Citadel-Station-13/upstream-merge-31956 
[MIRROR] Ratvar summoning now ends the round/triggers mass proselytize
 2017-10-24 19:35:38 -04:00
LetterJay
fc8a0d0211 Merge pull request #3590 from Citadel-Station-13/upstream-merge-32042 
[MIRROR] Transit space blocks explosions
 2017-10-24 19:35:27 -04:00
LetterJay
0c688c8ab3 Merge pull request #3588 from Citadel-Station-13/upstream-merge-32032 
[MIRROR] adds logging to ripley gibs
 2017-10-24 19:35:05 -04:00
LetterJay
46e6d065e2 Merge pull request #3586 from Citadel-Station-13/upstream-merge-32024 
[MIRROR] Adds hidden fingerprints to crayon paintings
 2017-10-24 19:34:39 -04:00
LetterJay
a785e92570 Merge pull request #3583 from Citadel-Station-13/upstream-merge-32018 
[MIRROR] Moves opened firedoors underneath opened airlocks
 2017-10-24 19:34:23 -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
Jordan Brown
fa433109ce Transit space blocks explosions 2017-10-24 15:47:53 -05:00
LetterJay
98fbe6e813 Update shutters.dm 2017-10-24 15:26:28 -05:00
Armhulen
0090a71bea adds logging to ripley gibs (#32032) 
* maybe this works, and maybe it doesn't

* cyberfriend

* oh right
 2017-10-24 11:25:04 -05:00
kevinz000
0986857f18 Update crayons.dm (#32024) 2017-10-24 08:07:42 -05:00
LetterJay
aa420067ba Revert "[MIRROR] Late join antagonists will try to target late join players" 2017-10-24 00:09:11 -05:00
ShizCalev
889d2ba74e Moves opened firedoors underneath opened airlocks 2017-10-24 00:05:43 -05:00
LetterJay
dfe7295d4c Merge pull request #3580 from Citadel-Station-13/upstream-merge-31560 
[MIRROR] Late join antagonists will try to target late join players
 2017-10-23 23:02:37 -04:00
LetterJay
00da8a2ead Merge pull request #3575 from deathride58/mapsyncs1 
Map Syncs - TG-gnawed-on-too-many-cables Edition
 2017-10-23 23:02:23 -04:00
Jordan Brown
94826620fa Late join antagonists will try to target late join players (#31560) 2017-10-23 20:08:43 -05:00
LetterJay
6360be2041 Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883 
[MIRROR] Removes duplicate typecaches
 2017-10-23 20:16:51 -04:00
LetterJay
3243eaa6b8 Merge pull request #3573 from Citadel-Station-13/upstream-merge-32003 
[MIRROR] fixes AIs being able to teleport the id card console inserted cards to their core
 2017-10-23 16:54:57 -04:00
LetterJay
434d7d0a0b Merge pull request #3576 from Citadel-Station-13/upstream-merge-32002 
[MIRROR] Removes mob references from camera motion tracking
 2017-10-23 16:54:12 -04:00
LetterJay
ad3bafcb42 Update motion.dm 2017-10-23 14:16:15 -05:00
LetterJay
9367eb23c5 Update iv_drip.dm 2017-10-23 14:15:20 -05:00
LetterJay
9a86385a23 Merge pull request #3569 from Citadel-Station-13/upstream-merge-31834 
[MIRROR] mechs no longer spam deflect attack messages for attacks with no damage
 2017-10-23 15:08:45 -04:00
LetterJay
fc07e15f61 Merge pull request #3563 from Citadel-Station-13/upstream-merge-31992 
[MIRROR] Fixes being unable to merge full stacks
 2017-10-23 14:52:28 -04:00
LetterJay
c17d1dce40 Merge pull request #3559 from Citadel-Station-13/upstream-merge-31948 
[MIRROR] Fixes champrojector camera bugs
 2017-10-23 14:50:34 -04: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
vuonojenmustaturska
636ab7d156 Removes mob references from camera motion tracking 2017-10-23 13:32:32 -05:00
LetterJay
23765d9ddd Update stunbaton.dm 2017-10-23 13:17:35 -05:00
deathride58
c1bd7bc6ba Map syncs 1 - Code syncs 2017-10-23 12:56:26 -04:00
kevinz000
f4e0eab993 fixes AIs being able to teleport the id card console inserted cards to their core (#32003) 
* Update card.dm

* Update card.dm
 2017-10-23 08:59:24 -05:00
Jordan Brown
c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
kevinz000
82f58c4ae2 Update mecha_defense.dm (#31834) 2017-10-23 08:20:02 -05:00
LetterJay
095839becf Merge pull request #3553 from Citadel-Station-13/upstream-merge-31969 
[MIRROR] Gets rids of spawns in airlock code
 2017-10-23 04:05:19 -04:00
LetterJay
a1236008f3 Merge pull request #3552 from Citadel-Station-13/upstream-merge-31355 
[MIRROR] Code Consistency: luminosity --> light_range
 2017-10-23 03:44:46 -04:00
LetterJay
4dc2ac3d94 Merge branch 'master' into upstream-merge-31913 2017-10-23 01:25:35 -04:00
YPOQ
2c251f929f Fixes being unable to merge full stacks (#31992) 2017-10-23 00:09:29 -05:00
MoreRobustThanYou
5504b4c1e2 Fixes champrojector camera bug (#31948) 2017-10-22 17:50:11 -05: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
8b4c183a26 Update lightswitch.dm 2017-10-22 10:55:52 -05:00
LetterJay
dadc96ef98 Update overmind.dm 2017-10-22 10:50:58 -05:00
MoreRobustThanYou
26d6e9e67b Gets rids of spawns in airlock code (#31969) 
* Gets rids of spawns in airlock code

* Update airlock.dm
 2017-10-22 00:16:54 -05:00
Firecage
25b5bb3e44 Code Consistency: luminosity --> light_range 2017-10-22 00:06:35 -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