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

720 Commits

Author SHA1 Message Date
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
deathride58
57d8457108 Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645 
[MIRROR] Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog
 2018-01-08 04:15:47 +00:00
Ashe Higgs
c3712f5be5 Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog (#33645) 
* Objects touched by servants now warp to the Ark

* Check by servant

* Replaces with a baselock

* Updates the 'log
 2018-01-07 20:18:28 -06:00
kevinz000
ff80771081 Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason (#34157) 
* Fixes dchat broadcast

* Update communications.dm
 2018-01-07 18:51:16 -06:00
deathride58
d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
Cruix
015c46cbae Removed some superfluous stack code (#34083) 2018-01-05 06:01:36 -06:00
deathride58
e6ec24d13c Merge branch 'master' into mapsyncs43293845982 2018-01-05 02:03:51 +00:00
Dax Dupont
bf3468f61c Adds more observation messages in deadchat (#34075) 
* Adds more observation messages

* so bold kobold

* caching
 2018-01-04 15:16:58 -06:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
LetterJay
6d1095a3cb Merge pull request #4603 from Citadel-Station-13/upstream-merge-33917 
[MIRROR] Always use the area name when selecting a teleport beacon
 2018-01-03 04:56:55 -06:00
LetterJay
3a2deb1d49 Merge branch 'master' into upstream-merge-33601 2018-01-02 18:26:18 -06:00
LetterJay
4dcc65a6bc Merge branch 'master' into upstream-merge-33917 2018-01-02 17:14:53 -06:00
LetterJay
6b1f18d60c Merge pull request #4636 from Citadel-Station-13/upstream-merge-34021 
[MIRROR] Fixes ocky icky in the bank vault
 2018-01-02 15:47:01 -06:00
Dax Dupont
6c606654c3 Removes icky ocky from the vault (#34021) 2018-01-02 13:31:28 -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
07adb3fdd6 Update teleporter.dm 2018-01-01 04:06:33 -06:00
LetterJay
4899131230 Update teleporter.dm 2018-01-01 04:06:14 -06:00
LetterJay
7a6cf002d3 Revert "[MIRROR] Fix PDA message photos not being viewable" 2017-12-31 06:41:03 -06:00
LetterJay
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
LetterJay
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
Tad Hardesty
38870f4056 Fix PDA message photos not being viewable 2017-12-30 21:27:31 -06:00
LetterJay
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 Brown
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
Jordan Brown
75f492f416 Always use the area name when selecting a teleport beacon 2017-12-30 13:55:17 -06:00
LetterJay
7c69a835be Update teleporter.dm 2017-12-30 13:32:29 -06:00
LetterJay
47174097e1 Update communications.dm 2017-12-30 13:32:19 -06:00
LetterJay
8452cc74d0 Update newscaster.dm 2017-12-30 13:21:31 -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
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
Jordan Brown
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
LetterJay
a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -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
YPOQ
6fac704a4f Fixes AI eyes getting nullspaced when jumping to deleted cameras (#33856) 2017-12-29 00:28:47 -06:00
LetterJay
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
deathride58
b8dc623ebc Update poddoor.dm 2017-12-27 21:57:51 -05: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
b258879423 Merge pull request #4537 from Citadel-Station-13/upstream-merge-33828 
[MIRROR] Revert "Vending TGUI"
 2017-12-28 02:53:22 +00:00
oranges
269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
Jordan Brown
dbab8bbdab Adds open/close sound to blastdoors and shutters 2017-12-27 10:50:17 -06:00
LetterJay
2e6b034493 save point - a lot of shit to fix 2017-12-27 07:03:40 -06:00
Leo
889e281a57 Revert "Vending TGUI" 2017-12-26 09:10:48 -06:00
LetterJay
4cfb2e323b Merge branch 'master' into upstream-merge-33504 2017-12-26 06:08:12 -06:00
LetterJay
91e87bf801 Merge pull request #4482 from Citadel-Station-13/upstream-merge-33584 
[MIRROR] Tiles blessed by holy water now block servant warp-in/Eminence snooping
 2017-12-25 21:27:17 -06:00
Cruix
8465defbb0 Modified the starting locations of advanced camera console eyes (#33759) 
* Modified the starting locations of advanced camera console eyes
Made shuttle navigation computers no longer work on z levels they are not locked to

* Advanced camera eyes do not start on the console if they use static and the console is in camera view but not on a usable z-level
 2017-12-25 19:14:33 -06:00
Emmett Gaines
9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
LetterJay
ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
LetterJay
99b88b4c4d Merge pull request #4521 from Citadel-Station-13/upstream-merge-33739 
[MIRROR] Vending TGUI
 2017-12-24 17:01:04 -06:00
LetterJay
c99d847163 Merge pull request #4518 from Citadel-Station-13/upstream-merge-33765 
[MIRROR] Make airlocks use VARSET_CALLBACK
 2017-12-24 17:00:41 -06:00