Commit Graph

105 Commits

Author SHA1 Message Date
deathride58
b40310867e Update captain.dm 2018-03-02 21:39:10 -05:00
Sirenfal
44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -06:00
Chayse Ramsay
863dad8906 Changes the HoP to require Service experience (#5618) 2018-02-21 09:32:10 -06:00
CitadelStationBot
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 Ramsay
377c116662 Merge branch 'master' into QM-as-Head 2018-02-16 13:09:58 +00:00
ThePainkiller
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 Ramsay
9c3c039dc1 Commenting out civilian job global init 2018-02-15 10:15:02 +00:00
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045
TG Sync #4985279348672983476
2018-02-14 04:11:44 +00:00
Iamgoofball
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
deathride58
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
deathride58
8aacd2c804 Update job_exp.dm 2018-02-11 16:44:29 -05:00
vuonojenmustaturska
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 Brown
08a12bba53 Fix sql error in exp updates 2018-02-11 15:25:23 -06:00
PKPenguin321
bdab8a71d9 adds italian moustache that makes you italian 2018-02-08 14:30:30 -06:00
CitadelStationBot
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
CitadelStationBot
9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -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
vuonojenmustaturska
6c855bfcee fix lizard jobs (#34994) 2018-01-28 08:16:23 -06:00
oranges
38f0f17fb7 Merge pull request #35031 from KorPhaeron/imthecook
Stops titlescreen chef spam
2018-01-27 23:21:39 -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
MrDoomBringer
449c7d79df Cargotechs now spawn with Export Scanners (#34595)
* excessiveuseof[b]obblestone

* whups

* praisenarsie
2018-01-19 22:32:17 -06:00
Jordan Brown
f3627b8428 Merge pull request #34331 from Shadowlight213/expplayervisibility
Players can now see their own tracked playtime
2018-01-19 08:45:02 -06:00
deathride58
d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
Leo
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
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
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
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
KorPhaeron
3f297ccb79 Fixes chaplain not getting his weapon on spawn (#32658) 2017-11-13 03:16:01 -06:00
Michiyamenotehifunana
d0a28fcd62 NERF EVERYTHING
EVERYTHING OP NERF NOW also what the fuck how does a whole playerbase ignore balance issues for a whole fucking month only for a vilified member of the community to be so fucking helpful
2017-10-30 15:01:37 +08:00
LetterJay
6cd4e67f36 Update silicon.dm 2017-09-29 23:44:43 -05:00
LetterJay
8e1cbb68ca Update assistant.dm 2017-09-29 23:44:23 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
LetterJay
954b056e97 Update security.dm 2017-09-25 11:56:55 -05:00
vuonojenmustaturska
11a3395690 Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart 2017-09-24 17:42:13 -05:00
Poojawa
dd4f68dfee Cleans up .rej spam and the empty file from #2792 (#2818)
* Cleans up .rej spam and the empty file from #2792

* Update tgstation.dme
2017-09-17 11:56:55 -05:00
LetterJay
a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
LetterJay
16c7706618 Merge branch 'master' into upstream-merge-30117 2017-09-11 18:10:15 -05:00
LetterJay
3e0ead1204 Merge branch 'master' into upstream-merge-29105 2017-09-02 07:11:32 -05:00
LetterJay
fed956efec Update job_exp.dm 2017-09-02 06:56:35 -05:00
CitadelStationBot
50b88388da Crew monitoring rework part 1: crew pinpointers 2017-08-30 17:03:20 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
196c9d0597 Adds tracking amount of time spent playing departments 2: The fall of the Assistants. 2017-08-20 06:01:24 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
ef715b7837 Removes all checks for subsystem existence (#2252) 2017-08-04 08:41:52 -07:00