shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,113 Commits 5 Branches 0 Tags
515092bd1c2f49fe016d541d4e25bdbe9ff6bba9
Commit Graph
2880 Commits
Author SHA1 Message Date
LetterJayandGitHub 515092bd1c Merge branch 'master' into upstream-merge-33919 2018-01-01 04:11:29 -06:00
LetterJayandGitHub 3a8f27a2bf Merge pull request #4623 from Citadel-Station-13/upstream-merge-33960 
[MIRROR] Corrects flamethrower capitalization
 2017-12-31 15:23:14 -06:00
Jordan BrownandCitadelStationBot 54032f9c6d Merge pull request #33960 from ShizCalev/flamer 
Corrects flamethrower capitalization
 2017-12-31 10:02:59 -06:00
Jordan BrownandCitadelStationBot 4e0efc64d5 Merge pull request #33957 from ninjanomnom/helper-cleanup 
cleans up some behaviour for PlaceOnTop/Bottom
 2017-12-31 10:01:46 -06:00
LetterJayandGitHub 7a6cf002d3 Revert "[MIRROR] Fix PDA message photos not being viewable" 2017-12-31 06:41:03 -06:00
LetterJayandGitHub d8e85b5f15 Merge pull request #4613 from Citadel-Station-13/upstream-merge-33945 
[MIRROR] Improves loot drop spawners, adds AI law spawners to cores
 2017-12-31 02:52:44 -06:00
LetterJayandGitHub 88df151bd7 Merge pull request #4612 from Citadel-Station-13/upstream-merge-33947 
[MIRROR] Last resort now requires a confirmation.
 2017-12-31 02:52:29 -06:00
LetterJayandGitHub 515c4a0472 Merge pull request #4611 from Citadel-Station-13/upstream-merge-33940 
[MIRROR] Fix PDA message photos not being viewable
 2017-12-31 02:52:03 -06:00
LetterJayandGitHub 7998f037bd Merge pull request #4609 from Citadel-Station-13/upstream-merge-33580 
[MIRROR] Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
 2017-12-31 02:51:44 -06:00
LetterJayandGitHub 503f8e2635 Merge pull request #4605 from Citadel-Station-13/upstream-merge-33805 
[MIRROR] Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
 2017-12-31 02:50:21 -06:00
vuonojenmustaturskaandCitadelStationBot 9dd9d9413a Improves loot drop spawners, adds AI law spawners to cores (#33945) 
* hymn to breaking strain

* remove subtypes as requested

* no-one saw that
 2017-12-31 02:27:12 -06:00
F-OSandCitadelStationBot 9c8959f2ff Last resort now requires a confirmation. (#33947) 
* Update headcrab.dm

* fixed

* fuck

* Update headcrab.dm

* Update headcrab.dm
 2017-12-31 02:24:53 -06:00
Tad HardestyandCitadelStationBot 38870f4056 Fix PDA message photos not being viewable 2017-12-30 21:27:31 -06:00
orangesandCitadelStationBot 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
LetterJayandGitHub 4237a8910c Merge pull request #4483 from Citadel-Station-13/upstream-merge-33682 
[MIRROR] Makes newscaster feedback messages and comments always a list.
 2017-12-30 14:13:03 -06:00
Jordan BrownandCitadelStationBot 3802cf8586 Merge pull request #33805 from Cruix/shuttle_machines 
Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
 2017-12-30 13:56:43 -06:00
LetterJayandGitHub 8452cc74d0 Update newscaster.dm 2017-12-30 13:21:31 -06:00
LetterJayandGitHub 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
Jordan BrownandCitadelStationBot cbb8d807f1 turfs changed to /space/basic are instead turned into /space 2017-12-30 13:14:04 -06:00
LetterJayandGitHub f860fa0cd3 Update closed.dm 2017-12-30 05:12:10 -06:00
LetterJayandGitHub 19c6db6a6e Merge pull request #4591 from Citadel-Station-13/upstream-merge-33905 
[MIRROR] Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
 2017-12-30 05:06:03 -06:00
LetterJayandGitHub 4599680f68 Merge pull request #4580 from Citadel-Station-13/upstream-merge-33842 
[MIRROR] Internal radio implant
 2017-12-30 05:03:48 -06:00
LetterJayandGitHub 2d9a70a487 Update uplink_kits.dm 2017-12-29 18:42:44 -06:00
Jordan BrownandCitadelStationBot d38a4a2aa5 Merge pull request #33905 from ShizCalev/jumpsuit-fix 
Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
 2017-12-29 10:10:30 -06:00
LetterJayandGitHub a56882556b Update _eminence.dm 2017-12-29 07:36:03 -06:00
LetterJayandGitHub a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
LetterJayandGitHub e17f9fdc07 Merge pull request #4586 from Citadel-Station-13/upstream-merge-33895 
[MIRROR] Corrects abductor uncuffing message
 2017-12-29 06:47:56 -06:00
LetterJayandGitHub 80ce187d3d Merge pull request #4583 from Citadel-Station-13/upstream-merge-33873 
[MIRROR] The Radiance (eminence after ratvar awakens) can now ignore chapel tiles
 2017-12-29 06:26:06 -06:00
LetterJayandGitHub 0f328e22b2 Merge pull request #4574 from Citadel-Station-13/upstream-merge-33558 
[MIRROR] Dead cultists can now cross Reebe's "Servant Blocker"
 2017-12-29 06:24:09 -06:00
LetterJayandGitHub b13d4dd721 Merge pull request #4572 from Citadel-Station-13/upstream-merge-33807 
[MIRROR] Made atoms not smooth with shuttles
 2017-12-29 06:23:12 -06:00
LetterJayandGitHub 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
LetterJayandGitHub bbaee9f3d7 Merge pull request #4568 from Citadel-Station-13/upstream-merge-33880 
[MIRROR] Fixes wall CanPass
 2017-12-29 06:22:13 -06:00
LetterJay c7db4e8310 also syncs a bunch of shit 2017-12-29 04:12:43 -06:00
XDTMandCitadelStationBot 6eabea6a71 Corrects abductor uncuffing message (#33895) 
* Corrects abductor uncuffing message

* breaks
 2017-12-29 02:56:30 -06:00
MoreRobustThanYouandCitadelStationBot 07ba4e8189 The Radiance (eminence after ratvar awakens) can now ignore chapel tiles (#33873) 2017-12-29 02:55:03 -06:00
coiaxandCitadelStationBot 866318e33e Internal radio implant 2017-12-29 02:52:24 -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
RobustinandCitadelStationBot a9a94f7aed Dead cultists can now cross Reebe's "Servant Blocker" (#33558) 
* Dead Cultist Exception

* Servant blocker update

* Corpse balance

* Lets corpses pass servant blocker

* Lets cult corpses pass servant blocker

* Update servant_blocker.dm

* Update open.dm

* Update servant_blocker.dm

* Update open.dm
 2017-12-29 00:29:19 -06:00
CruixandCitadelStationBot ab408d3e97 Made atoms not smooth with shuttles (#33807) 
* Made atoms not smooth with shuttles

* Shuttle area canSmoothWithAreas is automatically assigned to the area's type if it is null

* Moved pirate shuttle areas into the multi-area shuttles section
 2017-12-29 00:29:04 -06:00
YPOQandCitadelStationBot 6fac704a4f Fixes AI eyes getting nullspaced when jumping to deleted cameras (#33856) 2017-12-29 00:28:47 -06:00
AnturKandCitadelStationBot fbdf24ddd4 Fixes wall CanPass (#33880) 2017-12-29 00:28:32 -06:00
coiaxandCitadelStationBot 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
LetterJayandGitHub 2ac9d9a171 Merge pull request #4554 from Citadel-Station-13/upstream-merge-33858 
[MIRROR] Adds open/close sound to blastdoors and shutters
 2017-12-28 23:57:40 -06:00
orangesandCitadelStationBot 0147b4a7e1 Merge pull request #33853 from tgstation/Cyberboss-patch-2 
If the world is launched with the "no-init" param. Master.Initialize isn't called
 2017-12-27 23:59:21 -06:00
deathride58andGitHub b8dc623ebc Update poddoor.dm 2017-12-27 21:57:51 -05:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub b258879423 Merge pull request #4537 from Citadel-Station-13/upstream-merge-33828 
[MIRROR] Revert "Vending TGUI"
 2017-12-28 02:53:22 +00:00
Jordan BrownandCitadelStationBot dbab8bbdab Adds open/close sound to blastdoors and shutters 2017-12-27 10:50:17 -06:00
LetterJay 0381491643 oops 2017-12-27 07:08:26 -06:00