3e0ead1204
Merge branch 'master' into upstream-merge-29105
2017-09-02 07:11:32 -05:00
fed956efec
Update job_exp.dm
2017-09-02 06:56:35 -05:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
196c9d0597
Adds tracking amount of time spent playing departments 2: The fall of the Assistants.
2017-08-20 06:01:24 -05:00
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
ef715b7837
Removes all checks for subsystem existence ( #2252 )
2017-08-04 08:41:52 -07:00
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
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
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
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
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -05:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
d1a77ef774
Ports bay's supermatter monitor modular program
2017-06-28 10:05:53 -05:00
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
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
0c2bf7e5ea
Station Engineers Spawn With Industrial Welder
2017-06-25 09:17:52 -05:00
a4c9dc43dd
Dufflebag => Dufflebag
2017-06-19 16:42:05 -05:00
44f4059968
Weaponizes station charters ( #1449 )
2017-06-13 13:47:17 -07:00
47687a6d1a
cleanup
2017-06-10 09:42:08 -05:00
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
f26cf4e9ef
Clown Toy Box + Wooden Crates
2017-06-09 11:02:37 -05:00
1bdda132e7
Adds Medal Commendations!
2017-06-08 20:39:15 -05:00
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
eeda9fd77f
Proposal: typed map variables ( #1398 )
2017-06-04 09:03:38 -07:00
fce022389a
Update job.dm
2017-05-30 17:07:04 -05:00
976086e490
Merge branch 'master' into upstream-merge-27534
2017-05-30 16:45:59 -05:00
a38973ece8
commit
2017-05-30 15:44:41 -05:00
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
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
e0fab7fa5e
fixes an oopsie
2017-05-29 01:25:02 -05:00
e3d228aa00
[MIRROR] ID card mapping aid ( #1223 )
...
* ID card mapping aid
* Update cards_ids.dm
* lf
2017-05-28 15:19:46 -07:00
e61acac6cc
boxes
2017-05-25 09:36:58 -05:00
31ca0575a2
Fixed some jobs not spawning with their box
2017-05-24 18:30:01 -05:00
6fb8aa7ee1
Adds marker beacons to mining as a vendible item
2017-05-24 16:32:43 -05:00
e02290bf2b
Replaced mob spawner vars with outfits
2017-05-23 07:57:42 -05:00
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
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
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
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
abc74c8b06
Fixes engraved messages
2017-05-14 14:50:49 -05:00
5b2521dad4
Tweaks the curator's access and clothing to improve his treasure hunting ability ( #882 )
2017-05-10 16:05:33 -07:00
9acc4da365
[MIRROR] Curator starts with the key to the display cases instead of being the key ( #763 )
...
* Curator starts with the key to the display cases instead of being the key
* Update displaycase.dm
* Delete displaycase.dm.rej
* Delete civilian.dm.rej
* Update civilian.dm
* fuck line endings
* define true/false
2017-05-08 00:25:59 -07:00
33a93a611b
Curator Update
2017-05-03 22:22:12 -05:00
3b8484b52b
Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
...
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
c1853bf0df
Librarians can speak any language
2017-04-28 12:17:33 -05:00
bde5d6253a
Unorphans the blackbox
2017-04-26 17:05:23 -05:00
0b9ed09965
Fixes a nullrod runtime
2017-04-19 14:06:44 -05:00
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
b26319cb16
Access changes for chaplain g.tech and engineers ( #297 )
...
* access tweaks
removes maint access from roles that don't need them, I.E janitor, and
assistant
* assistant tweak
removed checking for assistants have maint config
* Revert "assistant tweak"
This reverts commit 63fe914117a9e9c6b52a9effe29c2131c8da7a4e.
* Revert "access tweaks"
This reverts commit 68144943ee0e8b33cd8560a9dd4620532891424c.
* access changes (actually valid edition)
adds atmos access to engineers even on high pop rounds, because atmos
have all engi access and it makes sense to have it the other way round
strips the science access of geneticist because they don't actually need
to be in there even if they are technically researching genetics
* chaplain
removes chaplain theatre access becuase they don't really need it
* detective sec access
gives detective security access on skeleton crew
* Update security.dm
2017-04-03 14:47:51 -04:00
f67e9f6d87
Bleeding edgy refresh ( #303 )
...
* not code stuff
* other things
* global vars, defines, helpers
* onclick hud stuff, orphans, world.dm
* controllers and datums
* game folder
* everything not client/mobs in modules
* client folder
* stage 1 mob stuff
* simple animal things
* silicons
* carbon things
* ayylmaos and monkeys
* hyoomahn
* icons n shit
* sprite fixes
* compile fixes
* some fixes I cherrypicked.
* qdel fixes
* forgot brain refractors
2017-03-21 11:44:10 -05:00
LetterJay