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

227 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
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
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
Tad Hardesty
38870f4056 Fix PDA message photos not being viewable 2017-12-30 21:27:31 -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
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
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
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
oranges
269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
LetterJay
2e6b034493 save point - a lot of shit to fix 2017-12-27 07:03:40 -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
Jordan Brown
164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
Ashe Higgs
c5485faee7 Tiles blessed by holy water now block servant warp-in/Eminence snooping (#33584) 
* Blessing tiles blocks servant warp

* Removes the color

* Prevents the message from showing on the same turf
 2017-12-21 06:37:06 -06:00
LetterJay
2b434438e0 Update telecrystalconsoles.dm 2017-12-19 19:31:17 -06:00
LetterJay
f3e031fe2f Update telecrystalconsoles.dm 2017-12-19 18:02:16 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
XDTM
3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
LetterJay
f377aa441f Update telecrystalconsoles.dm 2017-12-17 15:56:54 -06:00
Jordan Brown
a834287d65 Fixes cross comms 2017-12-17 15:05:43 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
oranges
4204c889ed Merge pull request #32964 from AutomaticFrenzy/patch/joules 
Measure energy values in joules
 2017-12-05 03:23:06 -06:00
deathride58
21d5e8999c Merge branch 'master' into upstream-merge-32624 2017-12-04 17:12:53 -05:00
Leo
6d8d9802d4 Merge pull request #33153 from AnturK/adv_cam_cleanup 
Fixes some advanced camera issues
 2017-11-30 17:00:46 -06:00
Armhulen
d9c650970c making prs isn't even worth it anymore (#33056) 2017-11-24 22:36:22 -06:00
Jordan Brown
8943bf0184 Merge pull request #33041 from MrStonedOne/patch-452 
Lowers the stress the dna console puts on the string tree
 2017-11-23 12:07:17 -06:00
oranges
cec6c028f5 [READY]Refactors uplinks to a component! 2017-11-22 15:17:03 -06:00