Commit Graph

270 Commits

Author SHA1 Message Date
LetterJay
f19437bae9 Merge pull request #3307 from deathride58/crewobjtweaksgalore
Crew Obj & Miscreant system optimizations and tweaks
2017-10-12 07:16:13 -04:00
deathride58
2a46696e55 cleans up comments 2017-10-11 18:26:10 -04:00
deathride58
1a3b0c6528 applies optimizations to miscreants 2017-10-11 18:07:08 -04:00
deathride58
bd18903e13 eh it works 2017-10-11 18:03:58 -04:00
LetterJay
a75362cecc COLLAR 2017-10-11 08:05:49 -05:00
deathride58
501a09fee3 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into furryhippie 2017-10-09 14:42:47 -04:00
deathride58
c3f8a9da2c adds clown and mime offices, adds abandoned cafe, makes maint bar all access 2017-10-08 17:26:00 -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
LetterJay
2acc990425 donation items / framework for some 2017-10-07 23:27:25 -05:00
LetterJay
edce74eb51 Merge pull request #3179 from Michiyamenotehifunana/toyguns
Adds more toy guns
2017-10-07 01:04:03 -04:00
Michiyamenotehifunana
8774ef6914 Boolean memes
No more zeroes or ones, only TRUE and FALSE. Well, for the toy stuff anyways. The rest of the guns will have a boolean fixing thing later.
2017-10-07 09:03:14 +08:00
deathride58
16e7cdea6c makes chemist druglord objective harder to cheese 2017-10-06 10:10:02 -04:00
Michiyamenotehifunana
1d4078cd63 Adds more toy guns
moar foam moar lasertag
2017-10-06 16:24:30 +08:00
deathride58
b37556a951 makes responsibility objective a little more clear 2017-10-04 20:19:43 -04:00
deathride58
5cefa71992 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-04 20:18:03 -04:00
Michiyamenotehifunana
4e31a45154 Nerf to 10mm Soporific Bullets (#3085)
Makes it require 3 shots instead of just 2 to put your victim to sleep.
2017-10-03 02:18:42 -07:00
LetterJay
ef671d8764 OOOOOOOH SHIIIIIIIIIIT 2017-10-03 03:55:05 -05:00
LetterJay
b95d35d56d FUCK. 2017-10-03 03:42:13 -05:00
LetterJay
c8f52d272e donation item 2017-10-03 00:18:21 -05:00
deathride58
f7c6c8b440 config. > CONFIG_GET 2: "all checks have failed" boogaloo 2017-10-02 18:53:57 -04:00
LetterJay
891f89e49a Update custom_items.dm 2017-10-02 15:34:36 -05:00
deathride58
8e65f4fb23 Merge branch 'master' into crewobjectivesandmiscreants 2017-10-01 23:45:49 +00:00
deathride58
e04e05d8b7 150 HOURS OF CODING 2017-10-01 19:37:15 -04:00
deathride58
6b81ecbeb0 time for 150 hours of testing 2017-09-29 17:46:59 -04:00
deathride58
808b0b6d9a guess whos bad at coding 2017-09-29 17:02:19 -04:00
deathride58
f2f5c6d53e completely reworks how objectives are selected, reduces copypasta 2017-09-29 16:55:38 -04:00
LetterJay
2858c53788 Merge pull request #2958 from Michiyamenotehifunana/wave3guns
Wave 3 of guns
2017-09-29 12:45:52 -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
9bdc80ba82 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-09-27 23:44:22 -04:00
Michiyamenotehifunana
59541efffb Wave 3 of guns
Reskinnable stetchkins, magrifle, flechette gun, Hyper-burst rifle, and 10mm soporific bullets.
2017-09-27 23:08:36 +08:00
LetterJay
26f0af19e0 update 2017-09-26 00:00:07 -05:00
LetterJay
e878e75c42 donator item 2017-09-25 23:49:06 -05:00
LetterJay
e97256023b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-09-25 11:59:23 -05:00
LetterJay
8cb93a512c Merge pull request #2907 from Michiyamenotehifunana/wave2ofguns
Wave 2 of guns
2017-09-24 11:32:41 -04:00
LetterJay
46b91db045 updated toy item to use the squeak component as well as update the icon for a donator 2017-09-24 10:27:09 -05:00
LetterJay
f8eef1755f oops 2017-09-23 10:09:59 -05:00
LetterJay
d25746fd66 donations items 2017-09-23 10:07:15 -05:00
Michiyamenotehifunana
05bbc43782 Wave 2 of guns
Spinfusor, X9, Magpistol.
2017-09-23 15:05:11 +08:00
deathride58
7e1d0afac7 fixes runtimes 2017-09-23 01:40:47 -04:00
LetterJay
5b38d23bfd oops 2017-09-21 02:28:37 -05: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
LetterJay
bb837fe20e donation item 2017-09-20 04:57:57 -05:00