Commit Graph

46 Commits

Author SHA1 Message Date
LetterJay
1a2ccbbd53 Merge branch 'master' into theprthatbulliesjanitormains 2017-12-22 02:56:10 -06: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
deathride58
525ef1bc65 gives janitors a liiiiiiiiiiiiil leeway 2017-11-24 01:59:39 -05:00
deathride58
bb690b24ba Update cit_crewobjectives_science.dm 2017-11-17 23:45:20 -05:00
deathride58
30514ff9c2 Revert "Revert "schrondinger's paranoia fix, also check_contents_for doesnt support lists""
This reverts commit 663d01702d.
2017-10-28 02:20:43 -04:00
deathride58
663d01702d Revert "schrondinger's paranoia fix, also check_contents_for doesnt support lists"
This reverts commit b83be3feae.
2017-10-28 02:20:29 -04:00
deathride58
b83be3feae schrondinger's paranoia fix, also check_contents_for doesnt support lists 2017-10-28 02:12:53 -04:00
deathride58
5ea5dc40df hos ded 2017-10-14 03:42:08 -04:00
deathride58
5d0853e16a Crew objective/miscreant system tweaks (#3213)
* Loadsa tweaks

* adds miscreant pref, other fixes

* fixes runtime

* fixes compiling errors for REAL now hopefully

* HOPEFULLY fixes compiling errors

* COMPILE!
2017-10-08 10:05:40 -07:00
deathride58
16e7cdea6c makes chemist druglord objective harder to cheese 2017-10-06 10:10:02 -04:00
deathride58
b37556a951 makes responsibility objective a little more clear 2017-10-04 20:19:43 -04:00
deathride58
f2f5c6d53e completely reworks how objectives are selected, reduces copypasta 2017-09-29 16:55:38 -04:00
deathride58
e81d692b8c adds research objective for scientists 2017-09-28 20:30:53 -04:00
deathride58
77048785cd gives miners a quest for fat stacks 2017-09-28 19:53:11 -04:00
deathride58
bf3644d64e adds points objective for cargonians 2017-09-28 19:41:13 -04:00
deathride58
de15e8fa6b Fixes reporter objective 2017-09-28 19:08:35 -04:00
deathride58
3711461873 makes the nukedisk objective exclusive to captain 2017-09-28 01:32:58 -04:00
deathride58
226ad9ddde adjustments 2017-09-28 01:10:42 -04:00
deathride58
43574eefe1 adds chaplain and curator objectives 2017-09-28 00:30:38 -04:00
deathride58
7e1d0afac7 fixes runtimes 2017-09-23 01:40:47 -04:00
deathride58
160246396e spacesuit objective rebrand 2017-09-21 00:57:51 -04:00
deathride58
b55ad7383e i give up 2017-09-21 00:14:03 -04:00
deathride58
4473b24180 work dammit 2017-09-20 21:58:42 -04:00
deathride58
f69ab93a2c theres a proc for that 2017-09-19 23:31:08 -04:00
deathride58
ba05e177fd ffs work already 2017-09-19 22:53:47 -04:00
deathride58
f2b63c1159 *foaming at mouth in far distance* 2017-09-19 22:33:00 -04:00
deathride58
d2ffa0def6 fixed. 100% fixed. i hope. 2017-09-17 01:20:29 -04:00
deathride58
428a416447 friendly reminder that mekhi anderson belongs on the table 2017-09-17 01:10:12 -04:00
deathride58
e20d45f3d5 how is this intuitive in any way, shape, or form 2017-09-17 00:47:14 -04:00
deathride58
e8c7cb4f51 there we go 2017-09-17 00:35:03 -04:00
deathride58
a10f27ff14 runtime nerfs 2017-09-16 23:44:39 -04:00
deathride58
9676b9f26d places the cat firmly on a table 2017-09-16 23:18:57 -04:00
deathride58
45330c909a aphrodisiac is drugs now, no need to add them to the chemlist manually 2017-09-10 02:51:58 -04:00
deathride58
0ba79c0ad5 i ded (replaces justicecrew for non-lawyer sec with a more open objective) 2017-09-10 02:46:06 -04:00
deathride58
c1078c2c3e eugh 2017-09-08 17:56:42 -04:00
deathride58
bed1f4d88e gonna compile sooner or later 2017-09-08 17:27:57 -04:00
deathride58
591a086a4f .... apparently poly isn't a pet? 2017-09-08 17:17:59 -04:00
deathride58
3852a246f8 byond cant handle ternaries 2017-09-08 16:47:42 -04:00
deathride58
c852910714 there we go 2017-09-08 16:34:20 -04:00
deathride58
547799c3ac bluh 2017-09-08 16:26:33 -04:00
deathride58
9116be1e53 Extra objectives for assistants, poly objective for CE 2017-09-08 16:20:40 -04:00
deathride58
f8d149975f engineering objectives, removes assistant petsplosion 2017-09-07 15:43:17 -04:00
deathride58
d5151ed918 fixes 2017-09-07 01:01:23 -04:00
deathride58
a972a6272f chef objective 2017-09-06 22:54:51 -04:00
deathride58
68a6ff5cfb just,,, compile, please 2017-09-06 22:24:10 -04:00
deathride58
15ab156b86 moves crew objectives into separate files 2017-09-06 21:04:45 -04:00