shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,283 Commits 5 Branches 0 Tags
a227ddf3c1acdfac2dcbccf2083fc53df0ddffa2
Commit Graph

1541 Commits

Author SHA1 Message Date
deathride58
6dc4584401 Merge pull request #4643 from Citadel-Station-13/upstream-merge-34033 
[MIRROR] Fix mimes being able to laugh audibly
 2018-01-03 18:54:12 +00:00
Leo
c1623792c9 Merge pull request #34033 from AutomaticFrenzy/patch/mime-laugh 
Fix mimes being able to laugh audibly
 2018-01-03 07:36:43 -06:00
ShizCalev
c41bf82380 Fixes observers not being transfered to new mobs (#34039) 2018-01-03 07:33:53 -06:00
LetterJay
dcca57808b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/game/gamemodes/blob/overmind.dm
 2018-01-02 14:58:09 -06:00
LetterJay
943388d8f4 Merge pull request #4367 from Citadel-Station-13/upstream-merge-33463 
[MIRROR] Adds blob roundend report.
 2018-01-02 14:56:12 -06:00
LetterJay
d035f16aca Update basilisk.dm 2018-01-02 05:24:47 -06:00
LetterJay
f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2018-01-02 05:16:13 -06:00
LetterJay
b49009d481 Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621 
[MIRROR] removes silly garbage defines
 2018-01-02 04:52:57 -06:00
LetterJay
9ede14fbce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574 2018-01-01 14:14:06 -06:00
LetterJay
30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
LetterJay
168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311 2018-01-01 07:00:34 -06:00
LetterJay
7d4a51f659 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33463 2018-01-01 04:36:29 -06:00
Jordan Brown
19c35c63d6 Merge pull request #33951 from AnturK/perspective_fix 
Fixes reset_perspective runtimes
 2017-12-31 09:58:02 -06:00
oranges
3208404f14 Merge pull request #33580 from Xhuis/defenses_balancing 
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
 2017-12-30 16:59:07 -06:00
LetterJay
32291c247b Update megafauna.dm 2017-12-30 13:33:45 -06:00
LetterJay
2994b4b7c2 Update blood_drunk_miner.dm 2017-12-30 13:33:37 -06:00
LetterJay
449ae34621 Update hostile.dm 2017-12-30 13:33:25 -06:00
LetterJay
c8f3fdfe38 Merge branch 'master' into upstream-merge-33663 2017-12-30 13:29:36 -06:00
LetterJay
dae3c3efb5 Merge branch 'master' into upstream-merge-33621 2017-12-30 13:23:39 -06:00
LetterJay
b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705 
[MIRROR] Turns the baseturf var into a part time list
 2017-12-30 13:19:00 -06:00
LetterJay
72d0ca2f1a Merge pull request #4590 from Citadel-Station-13/upstream-merge-33796 
[MIRROR] Monkeymode fixes
 2017-12-30 05:05:20 -06:00
LetterJay
de0ade801c Merge pull request #4589 from Citadel-Station-13/upstream-merge-33903 
[MIRROR] Fixes mobs targeting from inside things.
 2017-12-30 05:04:09 -06:00
LetterJay
4599680f68 Merge pull request #4580 from Citadel-Station-13/upstream-merge-33842 
[MIRROR] Internal radio implant
 2017-12-30 05:03:48 -06:00
LetterJay
a3ebaa5de8 Merge branch 'master' into upstream-merge-32311 2017-12-29 18:38:50 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
MoreRobustThanYou
459d4f35c7 Monkeymode fixes (#33796) 
* Monkey fixes

* Update say.dm
 2017-12-29 10:08:17 -06:00
Jordan Brown
8059894d7d Merge pull request #33903 from AnturK/pilot-fixes 
Fixes mobs targeting from inside things.
 2017-12-29 10:01:57 -06:00
LetterJay
a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
LetterJay
b8370a7786 Merge pull request #4582 from Citadel-Station-13/upstream-merge-33882 
[MIRROR] Spell action buttons finally fixed
 2017-12-29 06:25:54 -06:00
LetterJay
f093bb8fec Merge pull request #4570 from Citadel-Station-13/upstream-merge-33856 
[MIRROR] Fixes AI eyes getting nullspaced when jumping to deleted cameras
 2017-12-29 06:22:35 -06:00
Robustin
d7723a064c Spell action buttons finally fixed (#33882) 
* Action button fix

* Action button fix

* Spell action button fix

* Spell action button fix

* Update alien_powers.dm

* Update spell.dm

* Action button fix

* Update touch_attacks.dm
 2017-12-29 02:54:50 -06:00
coiax
866318e33e Internal radio implant 2017-12-29 02:52:24 -06:00
XDTM
d8943d6a1e [Ready]Adds the Pax reagent, small tweaks to pacifism 2017-12-29 02:37:58 -06:00
LetterJay
518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
 2017-12-29 01:34:17 -06:00
LetterJay
1047dccdd5 fk 2017-12-29 01:20:09 -06:00
deathride58
96543b5e63 Merge pull request #4566 from Citadel-Station-13/upstream-merge-33881 
[MIRROR] Makes reset_perspective handle turf as eye
 2017-12-29 06:48:10 +00:00
deathride58
b03a8a70db Merge pull request #4556 from Citadel-Station-13/upstream-merge-33442 
[MIRROR] [READY]Adds picking up corgis and pAIs!
 2017-12-29 06:47:17 +00:00
YPOQ
6fac704a4f Fixes AI eyes getting nullspaced when jumping to deleted cameras (#33856) 2017-12-29 00:28:47 -06:00
Leo
868fbec32d Merge pull request #33881 from AnturK/walls-have-eyes 
Makes reset_perspective handle turf as eye
 2017-12-29 00:28:18 -06:00
LetterJay
8a792d6ef6 more save points 2017-12-29 00:07:36 -06:00
LetterJay
b3793ee6d4 Update living.dm 2017-12-28 23:58:07 -06:00
deathride58
3df98e631b Fixes compiling errors 2017-12-28 16:13:30 -05:00
deathride58
2fdb9e598f Modularizes dogborgs, adds new alternate skins for some modules, and more! 2017-12-28 15:50:33 -05:00
deathride58
90582d2e1a Merge pull request #4557 from Citadel-Station-13/upstream-merge-33831 
[MIRROR] adds handholding
 2017-12-28 02:59:56 +00:00
deathride58
754d3d9b28 Merge pull request #4539 from Citadel-Station-13/upstream-merge-33840 
[MIRROR] Logs traumas in the feedback database
 2017-12-28 02:53:01 +00:00
deathride58
c286dfcefb Merge pull request #4549 from Citadel-Station-13/upstream-merge-33833 
[MIRROR] Fixes ghost zoom being broken
 2017-12-28 02:52:08 +00:00
deathride58
36d8ff1811 Update mob.dm 2017-12-27 21:48:18 -05:00
kevinz000
c8788ed4f7 adds handholding 2017-12-27 16:20:44 -06:00
kevinz000
bf7838aded [READY]Adds picking up corgis and pAIs! 2017-12-27 15:47:57 -06:00
oranges
269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00