shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,299 Commits 5 Branches 0 Tags
cf9aff2995e41d760804aa80339e973260f2d3ea
Commit Graph

71 Commits

Author SHA1 Message Date
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
LetterJay
976086e490 Merge branch 'master' into upstream-merge-27534 2017-05-30 16:45:59 -05:00
LetterJay
a38973ece8 commit 2017-05-30 15:44:41 -05:00
LetterJay
2de531b2e7 Merge pull request #1173 from Citadel-Station-13/upstream-merge-27607 
[MIRROR] Fixed some jobs not spawning with their box
 2017-05-30 15:18:54 -05:00
LetterJay
9a64d4731c Merge pull request #1167 from Citadel-Station-13/upstream-merge-27589 
[MIRROR] Adds marker beacons to mining as a vendible item
 2017-05-30 15:02:44 -05:00
LetterJay
e0fab7fa5e fixes an oopsie 2017-05-29 01:25:02 -05:00
CitadelStationBot
e3d228aa00 [MIRROR] ID card mapping aid (#1223) 
* ID card mapping aid

* Update cards_ids.dm

* lf
 2017-05-28 15:19:46 -07:00
LetterJay
e61acac6cc boxes 2017-05-25 09:36:58 -05:00
CitadelStationBot
31ca0575a2 Fixed some jobs not spawning with their box 2017-05-24 18:30:01 -05:00
CitadelStationBot
6fb8aa7ee1 Adds marker beacons to mining as a vendible item 2017-05-24 16:32:43 -05:00
CitadelStationBot
e02290bf2b Replaced mob spawner vars with outfits 2017-05-23 07:57:42 -05:00
CitadelStationBot
a317d23a51 [MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916) 
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie

* fixes .rej
 2017-05-18 09:37:30 -05:00
CitadelStationBot
8bcaa54cbe [MIRROR] Fixes language code ignoring holder restrictions (#858) 
* Fixes language code ignoring holder restrictions

* resolve .rej file.
 2017-05-18 04:13:57 -05:00
CitadelStationBot
257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
CitadelStationBot
41f110380c [MIRROR] [READY]Gives the clown a pie cannon, also improves pneumatic cannons (#935) 
* [READY]Gives the clown a pie cannon, also improves pneumatic cannons

* Delete gang.dm.rej
 2017-05-14 20:18:02 -07:00
CitadelStationBot
abc74c8b06 Fixes engraved messages 2017-05-14 14:50:49 -05:00