Commit Graph

86 Commits

Author SHA1 Message Date
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
LetterJay
35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
LetterJay
27b826a6f1 Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260
[MIRROR] Changes all access const to be a define
2017-07-19 13:18:58 -05:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot
260a140f97 Ports instruments from /VG/station, including harmonicas, xylophones, saxophones, trombones, and a BIKE HORN. Repaths instruments to sound/instruments. Also, allows piano synth to play all instruments but eguitar and gives cargo a crate with everything. Clown gets the bike horn trumpet at roundstart. (#2034) 2017-07-17 00:52:43 -07:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
d1a77ef774 Ports bay's supermatter monitor modular program 2017-06-28 10:05:53 -05:00
LetterJay
090b8b5055 Merge pull request #1768 from Citadel-Station-13/upstream-merge-28740
[MIRROR] Station Engineers Spawn With Industrial Welder
2017-06-26 10:51:51 -05:00
LetterJay
ed6c0b042e Merge pull request #1508 from Citadel-Station-13/upstream-merge-28227
[MIRROR] Clown Toy Box + Wooden Crates
2017-06-26 04:29:08 -05:00
CitadelStationBot
0c2bf7e5ea Station Engineers Spawn With Industrial Welder 2017-06-25 09:17:52 -05:00
LetterJay
a4c9dc43dd Dufflebag => Dufflebag 2017-06-19 16:42:05 -05:00
CitadelStationBot
44f4059968 Weaponizes station charters (#1449) 2017-06-13 13:47:17 -07:00
LetterJay
47687a6d1a cleanup 2017-06-10 09:42:08 -05:00
LetterJay
eac4854adf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-28165 2017-06-10 09:38:21 -05:00
CitadelStationBot
f26cf4e9ef Clown Toy Box + Wooden Crates 2017-06-09 11:02:37 -05:00
CitadelStationBot
1bdda132e7 Adds Medal Commendations! 2017-06-08 20:39:15 -05:00
CitadelStationBot
9725329268 A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) 2017-06-07 03:06:15 -05:00
CitadelStationBot
eeda9fd77f Proposal: typed map variables (#1398) 2017-06-04 09:03:38 -07:00
LetterJay
fce022389a Update job.dm 2017-05-30 17:07:04 -05:00