shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,885 Commits 5 Branches 0 Tags
b0c94deff3e15a76743afef26c58f309d44a81b2
Commit Graph

323 Commits

Author SHA1 Message Date
deathride58
539621a846 Merge pull request #5127 from Citadel-Station-13/upstream-merge-34875 
[MIRROR] Removes overhead and fixes null runtime with NAMEOF
 2018-01-29 02:29:00 +00:00
LetterJay
84be31bb00 Update unsorted.dm 2018-01-28 15:19:22 -06:00
LetterJay
c7c2d25c14 Merge pull request #5134 from Citadel-Station-13/upstream-merge-34923 
[MIRROR] Fixes roundend report runtime
 2018-01-27 14:18:46 -06:00
oranges
56f1634886 Merge pull request #34923 from Jordie0608/escapedisreallyamisnomerbecauseyoucanneverescapefromss13 
Fixes roundend report runtime
 2018-01-26 22:03:26 -06:00
AnturK
c86f4b7351 Fixes marooned status. 2018-01-26 14:41:36 -06:00
vuonojenmustaturska
e16c4c73e3 Removes overhead and fixes null runtime with NAMEOF 2018-01-26 12:46:14 -06:00
Jordan Brown
0b2f1c2826 Merge pull request #34829 from AnturK/photosnotmovies 
Removes animation from photos
 2018-01-24 06:12:46 -06:00
LetterJay
72812999f1 Merge pull request #5044 from Citadel-Station-13/upstream-merge-34465 
[MIRROR] Expands round end pop recording as json export
 2018-01-23 08:24:08 -06:00
Jordie
54466db36a Expands round end pop recording as json export (#34465) 
* expands round end pop recording as json export

* 511 compatibility and fix

* readds feedback for ned
 2018-01-23 01:57:53 -06:00
ShizCalev
dfdf01e79e Fixes portal storm event (#34725) 2018-01-22 16:25:19 -06:00
LetterJay
b87972b15c Merge pull request #5014 from Citadel-Station-13/upstream-merge-34314 
[MIRROR] Datum var cleanup
 2018-01-21 23:14:18 -06:00
Jordan Brown
e84617f17b Datum var cleanup (#34314) 
* Consolidates datum var location

* Move ui_screen to /datum/tgui

* Move focusers to datum.dm. Move fingerprintslast to /atom

* Remove focusers list, makes mobs check if their focus is QDELETED in Life()

* Consolidate use_tag and var_edited into datum_flags

* Revert garbage comment

* Thought I already removed this

* Remove the var_edited preservation

* Removes focus QDELETED handling
 2018-01-21 21:39:46 -06:00
AnturK
22f64c3b1f Fixes holes in station showing up white on photos. (#34697) 2018-01-21 21:17:49 -06:00
deathride58
28751ba370 Merge pull request #5001 from Citadel-Station-13/upstream-merge-34633 
[MIRROR] Refactor weather to use Z traits, assorted related cleanup
 2018-01-21 22:42:53 +00:00
Tad Hardesty
4451aca2e8 Refactor weather to use Z traits, assorted related cleanup (#34633) 
* Add a proc for getting the station center

* Add a couple of comments to ZTRAIT defines

* Remove unused global_map list

* Refactor weather to use the trait system

* Un-hardcode the transit z-level

* Use Z traits to determine Portal Storm event areas

* Fix loading away missions containing anything that reads traits
 2018-01-21 13:34:04 -06:00
LetterJay
c158d2f6dd Update game.dm 2018-01-21 11:56:09 -06:00
ShizCalev
f59a365c23 Fixes get_area_name runtime 2018-01-21 02:55:53 -06:00
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
Jordan Brown
9478478ca1 Merge pull request #34213 from MrStonedOne/gibstacktrace 
[ready] Adds a system to get a stack trace as a list.
 2018-01-18 22:45:39 -06:00
oranges
ebfc1c3d9c Cleans up some redundant stripped_input usage 2018-01-16 14:32:25 -06:00
AnturK
89766bdc4e Makes getFlatIcon slower. (Also more precise) (#34199) 
* getFlatIcon fixes and improvements. DO NOT TOUCH

* Fixes area blendings

* Stuff

* Drops the named arg
 2018-01-16 07:33:41 -06:00
deathride58
927913662d hopefully fixes new characters having underwear and fixes human tails/ears not saving 2018-01-14 15:25:13 -05:00
ShizCalev
80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
deathride58
661cf56031 Merge pull request #4777 from Citadel-Station-13/upstream-merge-34294 
[MIRROR] Add /datum prefix to custom root types
 2018-01-12 17:43:38 +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
Jordan Brown
bea8dae8c4 Add /datum prefix to custom root types (#34294) 2018-01-11 21:28:02 -06:00
LetterJay
2e6891f0c2 Merge pull request #4755 from Citadel-Station-13/upstream-merge-34242 
[MIRROR] Precision in timekeeping is important, okay.
 2018-01-11 15:16:05 -06:00
Tad Hardesty
72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -06:00
Leo
7efa8098fa Merge pull request #34242 from Someguynamedpie/patch-1 
Precision in timekeeping is important, okay.
 2018-01-11 07:40:19 -06:00
Tad Hardesty
149542ca26 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 07:39:52 -06:00
Leo
805442ee51 Merge pull request #34194 from ninjanomnom/tag-stack 
Makes the tag warning a stack_trace
 2018-01-10 03:12:54 -06:00
deathride58
af96f58ffd syncs defines 2018-01-03 23:15:49 -05: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
ea3652c30e fuk 2018-01-01 11:07:40 -06:00
LetterJay
6c147c9ef3 Merge branch 'master' into upstream-merge-33660 2018-01-01 04:59:20 -06:00
LetterJay
ab11e4be2e Merge pull request #4606 from Citadel-Station-13/upstream-merge-33937 
[MIRROR] printplayer fix for jobless minds
 2017-12-31 02:50:34 -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
3128c26698 Merge pull request #33937 from AnturK/printplayerfix 
printplayer fix for jobless minds
 2017-12-30 14:04:05 -06:00
LetterJay
dda430131a Update roundend.dm 2017-12-30 13:28:58 -06:00
LetterJay
54b6eddebc Merge branch 'master' into upstream-merge-33660 2017-12-29 18:40:29 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
LetterJay
a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
LetterJay
72ab9444c1 Merge pull request #4578 from Citadel-Station-13/upstream-merge-33876 
[MIRROR] Cleans up survivor counting tiny bit
 2017-12-29 06:25:11 -06:00
Leo
ad59b058ad Merge pull request #33876 from AnturK/roundend_feedback_standard 
Cleans up survivor counting tiny bit
 2017-12-29 00:29:49 -06:00
AnturK
ccdccb57af Adds roundend nuke disk location tracking to feedback. 2017-12-29 00:29:12 -06:00
Cruix
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
LetterJay
4cfb2e323b Merge branch 'master' into upstream-merge-33504 2017-12-26 06:08:12 -06:00
LetterJay
e2ba458400 Update roundend.dm 2017-12-24 02:40:05 -06:00
Jordan Brown
3f78bdcf59 Merge pull request #33606 from coiax/antaghud-on-end 
Everyone gains antag HUD at round end
 2017-12-21 14:24:49 -06:00
AnturK
a912e14912 Makes newscaster feedback messages and comments always a list. 2017-12-21 07:13:54 -06:00