shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,776 Commits 5 Branches 0 Tags
05ab5f7c0c15be95ae4c7ea1fad4e69d88171a39
Commit Graph

547 Commits

Author SHA1 Message Date
vuonojenmustaturska
e6487cc5ef Merge pull request #35692 from Cyberboss/GarbagePreInit 
Moves garbage up in the init order
 2018-02-15 10:38:02 -06:00
AnturK
38145c93c7 Greentext antag datum and OnRoundend hook. (#35584) 
* Greentext antag datum and OnRoundend hook.

* review stuff
 2018-02-13 19:43:54 -06:00
Robustin
1825c944b6 Cult Update? Cult Update! (#35433) 
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
 2018-02-12 15:18:21 -06:00
Jordan Brown
bed3f556c8 Removes runlevels spec from SSoverlays (#35455) 2018-02-10 11:02:20 -06:00
Jordan Brown
5a3b322d43 Atom initialization counter only shows up in TESTING mode (#35428) 2018-02-08 16:12:53 -06:00
deathride58
7b46f951cc Re-enables round autoend 2018-02-05 14:17:14 -05:00
CitadelStationBot
a5d1cae1ac [MIRROR] Fixes smugglers satchels being able to refresh items forever (#5313) 
* Fixes smugglers satchels being able to refresh items forever (#35270)

* Fixes smugglers satchels being able to refresh items forever
 2018-02-05 00:48:12 -06:00
Poojawa
8c48f46dd0 tump buckets and force the failsafe to trigger 2018-02-04 04:58:43 -06:00
Poojawa
4581364afd mso suggested remedy 2018-02-03 21:57:58 -06:00
deathride58
ab1c75edbb Temporarily disables autocall 2018-02-02 23:17:31 -05: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
LetterJay
0c3354cd16 Merge pull request #5047 from Citadel-Station-13/upstream-merge-34774 
[MIRROR] Corrects addtime stack_trace typo
 2018-01-23 10:00:19 -06:00
LetterJay
e672ff43ea Update timer.dm 2018-01-23 08:49:47 -06:00
Leo
3a11b4f068 Corrects addtime stack_trace typo 2018-01-23 06:43:20 -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
c0b4dd9cc5 Adds /area/asteroid/nearstation to blacklist (#34726) 2018-01-22 12:00:43 -06:00
LetterJay
f3e4ba69ec Merge pull request #5008 from Citadel-Station-13/upstream-merge-34711 
[MIRROR] Removes unused consts from dbcore
 2018-01-21 23:11:56 -06:00
Jordan Brown
006b9c95f2 Removes unused consts from dbcore (#34711) 2018-01-21 21:15:17 -06:00
Jordan Brown
5b7d74a80d Removes an unused proc 2018-01-21 18:13:02 -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
LetterJay
574bc8fe25 Update title.dm 2018-01-21 14:20:22 -06: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
Jordan Brown
8dead1da6a Config dir again except this time it works 2018-01-21 12:32:29 -06:00
LetterJay
c5ec80819f Merge pull request #4943 from Citadel-Station-13/upstream-merge-34571 
[MIRROR] Low memory mode
 2018-01-21 11:47:27 -06:00
deathride58
10e6de7421 Merge pull request #4920 from Citadel-Station-13/upstream-merge-34603 
[MIRROR] Revert "Fix config_dir usage (#34469)"
 2018-01-19 19:52:36 +00:00
deathride58
86ca34d806 Merge pull request #4953 from Citadel-Station-13/upstream-merge-34616 
[MIRROR] Adds byond versions to feedback
 2018-01-19 19:42:36 +00:00
Jordan Brown
e963853a89 Adds byond versions to feedback (#34616) 2018-01-19 09:24:36 -06:00
Jordan Brown
bcfbe4d14a Merge pull request #34513 from optimumtact/hostwiththemost 
Move roundid and schema check to dbcore subsystem
 2018-01-19 09:18:52 -06:00
Jordan Brown
f706605227 Low memory mode 2018-01-19 09:12:37 -06:00
deathride58
844a80dba6 Update title.dm 2018-01-19 08:48:09 -05:00
deathride58
7b5b354e9d Update ticker.dm 2018-01-19 08:47:49 -05:00
Leo
a0f815c5c4 Revert "Fix config_dir usage (#34469)" 2018-01-18 19:38:40 -06:00
LetterJay
91299a6152 Merge pull request #4838 from deathride58/loadoutsystem 
[READY FOR TESTMERGE] Ports Hippie's loadout system
 2018-01-18 15:32:00 -06:00
deathride58
5fd8606a3f migrates donor items to loadout system, comments out handle_roundstart_items, plus fixes 2018-01-17 17:19:54 -05:00
deathride58
b74518a24a adds more loadout equipment, adds working ckey whitelist system, and more 2018-01-16 16:23:22 -05: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
deathride58
b55a497ffc IT WORKS! its testmergable, just gotta add in a ckey whitelist system and add casual friday, then its good 2018-01-15 01:02:35 -05:00
Jordan Brown
29f0dc8006 Merge pull request #34417 from kevinz000/patch-431 
Removes SS_KEEP_TIMING from SSprojectiles
 2018-01-14 22:02:40 -06:00
Emmett Gaines
e27346812f Moves GLOB.movement_keys into SSinput and adds movement direction badminry (#34123) 
* badmin flip dirs

* moves movement_keys into SSinput from GLOB
 2018-01-14 13:39:01 -06: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
deathride58
e052255e91 Merge pull request #4768 from Citadel-Station-13/upstream-merge-34265 
[MIRROR] fixes safety check
 2018-01-11 21:33:35 +00:00
oranges
cfa8b8bad4 Merge pull request #34265 from tgstation/welostcountofhowmanycookieswerespawnedshutitalldown 
fixes safety check
 2018-01-11 14:13:09 -06:00
Tad Hardesty
72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -06:00
Jordan Brown
d8c3157741 Fixes error if next_map.json is missing (#34222) 2018-01-11 07:39:22 -06:00
deathride58
d4cf5d2eba Merge branch 'master' into upstream-merge-34067 2018-01-08 20:01:59 +00:00
deathride58
266457c274 Update title.dm 2018-01-07 23:17:11 -05:00
Jordan Brown
065b616af8 Removes standard resources from config tree 2018-01-07 20:32:08 -06:00
deathride58
ca058b1266 reverts rolling bucket timer subsystem 2018-01-07 15:15:21 -05:00
deathride58
e6ec24d13c Merge branch 'master' into mapsyncs43293845982 2018-01-05 02:03:51 +00:00