shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,928 Commits 5 Branches 0 Tags
dc6b4e2b61460dc795589b152ce324d39ae12f90
Commit Graph

4187 Commits

Author SHA1 Message Date
coiax
dc6b4e2b61 Christmas event changes (#33861) 
* A christmas tree with presents is now a subtype

Admins can now spawn `/obj/structure/flora/tree/pine/xmas/presents`
directly, instead of spawning regular christmas trees and then
triggering the event.

Also, the event now just deletes and replaces the xmas tree with a
present tree; saves on duplication of icon states and vars and all that.

* Code review I

* Gaia's Landing: The PR
 2017-12-29 00:28:02 -06:00
LetterJay
40859e3c0a Merge pull request #4563 from deathride58/anthromedibots 
[READY] Adds a new alternate sprite for mediborgs from Paradise (with modifications from Vivi) and more!
 2017-12-28 23:50:00 -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
oranges
0223fed7a3 Merge pull request #33868 from Robustin/EMPruntime 
Fixes EMP runtime
 2017-12-28 04:09:06 -06: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
aa83dbf500 Merge pull request #4532 from Citadel-Station-13/upstream-merge-33759 
[MIRROR] Modified the starting locations of advanced camera console eyes
 2017-12-28 02:54:18 +00:00
deathride58
a8154d102a Merge pull request #4531 from Citadel-Station-13/upstream-merge-33777 
[MIRROR] Arena shuttle teleport fix
 2017-12-28 02:53:47 +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
ca285046b0 Merge pull request #4552 from Citadel-Station-13/upstream-merge-33859 
[MIRROR] Hallucinations no longer show open doors "bolting"
 2017-12-28 02:50:50 +00:00
deathride58
36d8ff1811 Update mob.dm 2017-12-27 21:48:18 -05:00
Jordan Brown
df080960d4 Merge pull request #33888 from optimumtact/dothefandangomistersantiago 
relic teleport no longer recursively calls itself
 2017-12-27 19:32:26 -06:00
kevinz000
c8788ed4f7 adds handholding 2017-12-27 16:20:44 -06:00
Robustin
4a93756e6b Hallucinations no longer show open doors "bolting" (#33859) 
* No more "bolting" open doors

* Update Hallucination.dm

* Update Hallucination.dm
 2017-12-27 08:26:16 -06:00
LetterJay
e2d2c8cda0 Merge branch 'master' into upstream-merge-33627 2017-12-27 04:41:27 -06:00
LetterJay
2b77dda3e9 Merge pull request #4534 from Citadel-Station-13/upstream-merge-33780 
[MIRROR] Blocks auxiliary bases from being placed on top of lava or indestructible turfs
 2017-12-27 03:05:48 -06:00
LetterJay
67ef791794 Merge pull request #4535 from Citadel-Station-13/upstream-merge-33821 
[MIRROR] Fixes deleting handcuffs
 2017-12-27 03:05:33 -06:00
LetterJay
bb9e223b7d Merge pull request #4551 from Citadel-Station-13/upstream-merge-33749 
[MIRROR] Maybe make R&D console icons load faster
 2017-12-27 03:04:42 -06:00
LetterJay
0b2e6562af Merge pull request #4550 from Citadel-Station-13/upstream-merge-33770 
[MIRROR] adds ABSTRACT_1 flag to internal magazine objects
 2017-12-27 03:04:17 -06:00
LetterJay
6926e94bf8 Merge pull request #4548 from Citadel-Station-13/upstream-merge-33782 
[MIRROR] Fixed shuttle docking computers not working more than once
 2017-12-27 03:03:33 -06:00
LetterJay
11ca5afc92 Merge pull request #4546 from Citadel-Station-13/upstream-merge-33834 
[MIRROR] Drones now spawn with seasonal hats depending on active holidays [VERY Important PR]
 2017-12-27 03:03:16 -06:00
LetterJay
740ac71b2a Merge pull request #4545 from Citadel-Station-13/upstream-merge-33849 
[MIRROR] Fixes AI camera lights not updating when tracking mobs
 2017-12-27 03:02:11 -06:00
LetterJay
5400b8ac0e Merge pull request #4542 from Citadel-Station-13/upstream-merge-33839 
[MIRROR] Add song title display to Play Internet Sound
 2017-12-27 03:01:46 -06:00
Tad Hardesty
e87c591927 Maybe make R&D console icons load faster (#33749) 
* Maybe make design icons load faster

* Move design icon generation to asset_cache file
 2017-12-27 00:06:08 -06:00
oranges
76ccdcb94d Merge pull request #33770 from vuonojenmustaturska/internalmagfix 
adds ABSTRACT_1 flag to internal magazine objects
 2017-12-27 00:04:59 -06:00
oranges
20b8f9c87f Merge pull request #33833 from deathride58/please-repoban-kev 
Fixes ghost zoom being broken
 2017-12-26 23:50:33 -06:00
Cruix
b0facbda47 Fixed shuttle docking computers not working more than once (#33782) 
* Fixed shuttle docking computers not moving the docking port if it already existed

* Removed explicit type instantiation
 2017-12-26 23:44:16 -06:00
Jordan Brown
4499ff2fad Merge pull request #33834 from Xhuis/drone_hats 
Drones now spawn with seasonal hats depending on active holidays [VERY Important PR]
 2017-12-26 18:38:42 -06:00
YPOQ
752e3f7378 Fixes AI camera lights not updating when tracking mobs (#33849) 2017-12-26 18:30:24 -06:00
deathride58
dc0e3a89d5 Merge pull request #4523 from Citadel-Station-13/kevinz000-patch-3 
readds shock collars
 2017-12-26 22:10:09 +00:00
CitadelStationBot
8aed987bd9 [MIRROR] Fixes emagged cleanbot acid attack doing no damage (#4544) 
* Fixes emagged cleanbot acid attack doing no damage (#33848)

* Fixes emagged cleanbot acid attack doing no damage
 2017-12-26 13:58:16 -08:00
Tad Hardesty
2e4b622aa4 Add song title display to Play Internet Sound (#33839) 
* Add song title display to Play Internet Sound

* Expands youtube-dl -J flag
 2017-12-26 15:35:05 -06:00
Leo
e1092dd6de Merge pull request #33840 from XDTM/TraumaStats 
Logs traumas in the feedback database
 2017-12-26 09:36:36 -06:00
LetterJay
290c1e0868 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916 2017-12-26 08:24:20 -06:00
LetterJay
14472e5139 Merge pull request #4443 from Citadel-Station-13/upstream-merge-33485 
[MIRROR] code improvements from mso and co
 2017-12-26 07:38:17 -06:00
LetterJay
7be17b6f12 Merge pull request #4447 from Citadel-Station-13/upstream-merge-33639 
[MIRROR] Golems can wear labcoats
 2017-12-26 07:38:06 -06:00
LetterJay
358c625ed3 Merge pull request #4503 from Citadel-Station-13/upstream-merge-33590 
[MIRROR] [READY]Clownborgs - ADMIN SPAWN ONLY
 2017-12-26 05:59:52 -06:00
LetterJay
95642e631f Update shuttle.dm 2017-12-26 05:28:55 -06:00
LetterJay
e51baed92e Update labcoat.dm 2017-12-26 05:27:01 -06:00
ShizCalev
3ea4e84719 Fixes deleting handcuffs (#33821) 
* Fixes deleting handcuffs

* cleanup
 2017-12-26 00:13:13 -06:00
LetterJay
9eb78791a9 Update aux_base.dm 2017-12-25 22:53:44 -06:00
LetterJay
4b79ee5e94 Merge pull request #4527 from Citadel-Station-13/upstream-merge-33736 
[MIRROR] Ghosts can *spin and *flip
 2017-12-25 22:25:54 -06:00
LetterJay
4cefd9219f Update say.dm 2017-12-25 21:32:05 -06:00
LetterJay
a7a0823594 Update say.dm 2017-12-25 21:31:50 -06:00
LetterJay
41bae055ba Merge pull request #4524 from Citadel-Station-13/upstream-merge-33816 
[MIRROR] gives medical some medical boards, but not their own circuit imprinter yet
 2017-12-25 21:30:31 -06:00
LetterJay
5dd7136225 Merge branch 'master' into upstream-merge-33590 2017-12-25 21:29:18 -06:00
LetterJay
374ab40f4a Merge pull request #4497 from Citadel-Station-13/upstream-merge-33731 
[MIRROR] Tweaks the syndicate infiltrator so it's no longer lopsided.
 2017-12-25 21:26:34 -06:00
LetterJay
134201d185 Merge pull request #4494 from Citadel-Station-13/upstream-merge-32433 
[MIRROR] [READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
 2017-12-25 21:26:17 -06:00
Emmett Gaines
0a29f02c89 Blocks auxiliary bases from being placed on top of lava or indestructible turfs 2017-12-25 19:18:01 -06:00