shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,726 Commits 5 Branches 0 Tags
6a7d414fdf4b2612efcde00a43028e95f4e3344d
Commit Graph

253 Commits

Author SHA1 Message Date
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045 
TG Sync #4985279348672983476
 2018-02-14 04:11:44 +00:00
vuonojenmustaturska
d44ccdb009 Merge pull request #35575 from ShizCalev/communications-console-runtime 
Fixes communications console runtime
 2018-02-13 10:29:47 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
Jordan Brown
3674d38a99 Merge pull request #35493 from DaxDupont/cloner 
Fixed cloning pod status not updating when autocloning.
 2018-02-10 11:09:52 -06:00
deathride58
21d5781e37 Update arcade.dm 2018-02-07 14:05:34 -05:00
ShiggyDiggyDo
991922b323 Toy Daggers! 2018-02-07 02:31:58 -06:00
deathride58
3a79a17399 Merge pull request #5325 from Citadel-Station-13/upstream-merge-35316 
[MIRROR] Fixes comm message list for non-unique messages.
 2018-02-06 02:44:29 +00:00
Leo
f574bea5d1 Merge pull request #35316 from AnturK/commfix 
Fixes comm message list for non-unique messages.
 2018-02-05 14:37:50 -06:00
vuonojenmustaturska
903ab00096 Merge pull request #35299 from ShiggyDiggyDo/arcadegrammar 
fixes small grammar issue on arcades
 2018-02-05 09:11:51 -06:00
CitadelStationBot
b16d2148e4 [MIRROR] Steampunk Watches! (#5293) 
* Steampunk Watches! (#35187)

* Adds steampunk watches

* Adds steampunk watches to arcade machines

* The steampunk watch can now play a noise!

* Steampunk Watches!
 2018-02-05 01:31:16 -06:00
CitadelStationBot
0d01cb1f56 [MIRROR] Adds a log out button to record screen of the security records and allows you to print photos that are on file (#5298) 
* Adds a log out button to record screen of the security records and also allows you to print photos (#35160)

* Adds a log out button to record screen of the security records and allows you to print photos that are on file
 2018-02-05 00:54:22 -06:00
CitadelStationBot
e95269398c [MIRROR] Fixes sending cross station messages during wait period. (#5311) 
* Merge pull request #35286 from DaxDupont/commsfix

Fixes sending cross station messages during wait period.

* Fixes sending cross station messages during wait period.
 2018-02-05 00:49:03 -06:00
CitadelStationBot
684c98d2e2 [MIRROR] Cloner checks if occupant is human rather than just carbon (#5227) 
* Cloner checks if occupant is human rather than just carbon (#35077)

* Makes cloner sure its human

* Revert "Makes cloner sure its human"

This reverts commit 2591f2a7cd74cc83d9afcbac5df59bfea20962df.

* travis fix maybe

* Cloner checks if occupant is human rather than just carbon
 2018-02-04 22:07:42 -06:00
Poojawa
fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178) 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
 2018-01-29 04:42:29 -06:00
ShizCalev
cae2e5e1eb Shifts vars off /mob to the correct subtype 2018-01-24 12:00:05 -06:00
oranges
4dac26d2da Merge pull request #34765 from ShizCalev/apc-controller-runtime 
Fixes APC controller runtime
 2018-01-23 01:42:43 -06:00
Ashe Higgs
c9224a3185 allows servants to cancel warps more intuitively by clicking on the button again (#34504) 
* lets you cancel cc warps

* runtimestation
 2018-01-19 09:57:57 -06:00
coiax
497e6bb13f Various deadchat messages are more informative and consistent (#34326) 
More deadchat messages now follow the following format.

> George Mellons has done a thing at AreaName.

- Shuttle calling
- Shuttle recalling
- Security level changing
- Maintenance accessing
- Swiping for red,emergency maint, bsa
- Messenging centcom, syndicate

Fixes #34230.
Fixes #34231.
 2018-01-15 02:56:10 -06:00
ShizCalev
80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
deathride58
62cfb99cb7 Merge pull request #4788 from Citadel-Station-13/upstream-merge-34310 
[MIRROR] Removes some hrefs from logging
 2018-01-12 17:48:13 +00:00
deathride58
0c56db4f9b Merge pull request #4764 from Citadel-Station-13/upstream-merge-34090 
[MIRROR] Replace hardcoded z-level numbers with a trait system
 2018-01-12 17:41:28 +00:00
JJRcop
ed6ec3d63a Removes some hrefs from logging (#34310) 
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
 2018-01-12 07:04:39 -06:00
Tad Hardesty
72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -06:00
Tad Hardesty
149542ca26 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 07:39:52 -06:00
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