shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,841 Commits 5 Branches 0 Tags
be6fd4f0caff15ae87b2dcb642e9b6cf58b3bd07
Commit Graph
128 Commits
Author SHA1 Message Date
LetterJay ea9b3622fd Merge branch 'master' into upstream-merge-37476 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2018-05-20 23:11:16 -05:00
deathride58andGitHub 37b9d589ad Merge pull request #6679 from Citadel-Station-13/upstream-merge-37396 
[MIRROR] Track admin observer time
 2018-05-11 03:45:11 +00:00
Ordonisandletterjay ab81220eda Adds a French beret! HONH HONH HONH! (#37457) 
This is very similar to the Italian Moustache, but it's a beret. This will be part of a series of language items. Happy to entertain suggestions as to whether it should be a roundstart item or randomly scattered about maint/cargo crate restricted. In the spirit of atomizing PRs, this one will just be for the French Beret.

Ready for merge.
 2018-05-09 16:03:28 -05:00
Jordan Brownandletterjay baee4dead5 Merge pull request #37396 from KorPhaeron/mrcitruswantsyoutoclockin 
Track admin observer time
 2018-05-08 13:38:13 -05:00
deathride58andGitHub 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
orangesandCitadelStationBot 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
LetterJayandGitHub fbaa2d5ae8 Merge pull request #6370 from Citadel-Station-13/upstream-merge-37132 
[MIRROR] Fixes brain dna
 2018-04-14 07:44:36 -05:00
AnturKandCitadelStationBot 2aff700c14 Fixes brain dna 2018-04-11 14:58:42 -05:00
pigeonsandCitadelStationBot 7a07c101df AI requires silicon exp instead of crew exp for roundstart role (#36469) 
* Ai requires silicon xp

* Reverses byond age change
 2018-04-11 04:54:32 -05:00
deathride58andGitHub e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
KorPhaeronandCitadelStationBot 46b7b95897 Finishes overflow roles (#37053) 2018-04-09 05:10:14 -05:00
Poojawaanddeathride58 5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
kevinz000andCitadelStationBot 38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
vuonojenmustaturskaandCitadelStationBot 77e51603d4 move enforce_human_authority check before species.before_equip_job() 2018-04-04 09:03:37 -05:00
LetterJayandGitHub f7be23e78a Merge branch 'master' into upstream-merge-36442 2018-04-01 19:50:37 -05:00
Jordan BrownandCitadelStationBot 4d0df4ab16 Merge pull request #36865 from factoryman942/master 
adds a "the" to robo's supervisor in job description
 2018-04-01 11:16:57 -05:00
ArmhulenandCitadelStationBot 2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
PoojawaandGitHub 8cbdf9fcb4 Merge branch 'master' into digileg-runtime 2018-03-19 21:33:50 -05:00
CitadelStationBotandPoojawa 980d69dde3 [MIRROR] I'm a dumb idiot and forgot to change the antag_rep values (#6000) 
* I'm a dumb idiot and forgot to change the antag_rep values

* merge conflict
 2018-03-19 21:25:01 -05:00
CitadelStationBotandPoojawa 6aaef3b010 [MIRROR] Adds mineral storage access to all jobs intended to be using a technology fabricator[read: 80% of the jobs] (#6013) 
* Adds mineral storage access to all jobs intended to be using a technology fabricator[read: 80% of the jobs]

* RND techwebs: Mineral access (#36387)
 2018-03-19 21:08:54 -05:00
Poojawa d3407f1711 a few other little runtimes 2018-03-17 20:03:21 -05:00
ACCountandCitadelStationBot f0cf4ad29d [READY] NTNet airlocks 2018-03-08 22:42:46 -06:00
deathride58andGitHub b40310867e Update captain.dm 2018-03-02 21:39:10 -05:00
SirenfalandCitadelStationBot 44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -06:00
Chayse RamsayandPoojawa 863dad8906 Changes the HoP to require Service experience (#5618) 2018-02-21 09:32:10 -06:00
CitadelStationBotandPoojawa 1e65c813f0 [MIRROR] Extensive surgery additions (#5590) 
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
 2018-02-19 10:48:11 -06:00
Chayse RamsayandGitHub 377c116662 Merge branch 'master' into QM-as-Head 2018-02-16 13:09:58 +00:00
ThePainkillerandCitadelStationBot 87708abd4c Fixed a typo on an eldritch god's pronunciation (#35611) 
Changed the text to get the Necronomicon. It's "Cthulhu" not "Cthulu", get it right!
 2018-02-15 10:39:55 -06:00
Chayse RamsayandGitHub 9c3c039dc1 Commenting out civilian job global init 2018-02-15 10:15:02 +00:00
deathride58andGitHub 4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045 
TG Sync #4985279348672983476
 2018-02-14 04:11:44 +00:00
IamgoofballandCitadelStationBot 5793fe893f The Cook now only works under siege. (#35597) 
The chef's CQC skill now only works in the kitchen area
 2018-02-13 14:18:49 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
Chayse Ramsay a1116f6dc8 QM is now a Head of Staff, everyone rejoice 2018-02-12 01:52:33 +00:00
deathride58andGitHub 17ed07d3b2 Merge pull request #5427 from Citadel-Station-13/upstream-merge-35417 
[MIRROR] The chef is also a cook
 2018-02-11 23:35:29 +00:00
deathride58andGitHub 8aacd2c804 Update job_exp.dm 2018-02-11 16:44:29 -05:00
vuonojenmustaturskaandCitadelStationBot 95c2eb283a The chef is also a cook (#35417) 
* just a lowly, lowly cook

* come on, that's not striking an officer
 2018-02-11 15:26:33 -06:00
Jordan BrownandCitadelStationBot 08a12bba53 Fix sql error in exp updates 2018-02-11 15:25:23 -06:00
PKPenguin321andCitadelStationBot bdab8a71d9 adds italian moustache that makes you italian 2018-02-08 14:30:30 -06:00
CitadelStationBotandPoojawa e16db54c67 [MIRROR] Bartender Drink Sliding: Intrinsic to Extrinsic (#5297) 
* Bartender Drink Sliding: Intrinsic to Extrinsic

* Update packs.dm
 2018-02-05 04:42:13 -06:00
CitadelStationBotandPoojawa 9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
PoojawaandGitHub 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
vuonojenmustaturskaandCitadelStationBot 6c855bfcee fix lizard jobs (#34994) 2018-01-28 08:16:23 -06:00
orangesandCitadelStationBot 38f0f17fb7 Merge pull request #35031 from KorPhaeron/imthecook 
Stops titlescreen chef spam
 2018-01-27 23:21:39 -06:00
Jordan BrownandCitadelStationBot 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
MrDoomBringerandCitadelStationBot 449c7d79df Cargotechs now spawn with Export Scanners (#34595) 
* excessiveuseof[b]obblestone

* whups

* praisenarsie
 2018-01-19 22:32:17 -06:00
Jordan BrownandCitadelStationBot f3627b8428 Merge pull request #34331 from Shadowlight213/expplayervisibility 
Players can now see their own tracked playtime
 2018-01-19 08:45:02 -06:00
deathride58andGitHub d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
LeoandCitadelStationBot d5a54402cf Merge pull request #34127 from tgstation/Cyberboss-patch-7 
Removes the weird timer shennaigans from exp tracking
 2018-01-07 11:06:14 -06:00
deathride58 5dc3f29ad4 modules - E to L 2018-01-04 00:53:38 -05:00