Commit Graph

294 Commits

Author SHA1 Message Date
deathride58
a664384e81 Bhijn's touching dogborg balance again everyone panic (#3432)
* rebuffs everything and puts babyproof locks on scrubpup compactor

* lets it compile, removes things from the blacklist

* readds telegraphing due to popular vote, removes flash from scrubpups

* does githubs text editor work for basic thing on mobile

* reverts blacklist changes

* keeps spoolup, removes sounds + anime prepounce effects
2017-10-24 22:04:51 -05:00
LetterJay
14ed0d84e8 kill-me 2017-10-24 11:57:08 -05:00
LetterJay
cb30805b04 Update custom_items.dm 2017-10-24 11:25:30 -05:00
LetterJay
95cb834389 dupe item state for donation item 2017-10-23 23:34:15 -05:00
LetterJay
05e1efd020 Merge pull request #3529 from Michiyamenotehifunana/nerf-nerfs
Nerfs Autolathed Foam Guns
2017-10-22 12:18:35 -04:00
Poojawa
7b8e88ec7e Medihound Fixes (#3462)
* fix borgs, tries new things

* TGUI experiment, Expanded resist

also cleans up some bad code we don't want to keep

* kinda important to have the right one

* I actually managed to compile tgui

* tgui fuckery

I hate UI building

* more tgui tweaks

and it finally compiles, again.

* Have I mentioned UIs are not my strong point?

Because they're really not

* updates to this shit thing.

Tgui button chem selection -> chem to inject needs to be fixed

* No.

* FUCKING, FINALLY
2017-10-21 06:15:50 -05:00
Michiyamenotehifunana
f41c8ccccf Nerfs nerfs
NO MORE INSTANT BAGGABLE STUNS FROM AUTOLATHES!
2017-10-21 11:43:41 +08:00
LetterJay
d85dfb4aed i hate it all 2017-10-18 20:41:38 -05:00
LetterJay
fa7bbd50e5 fuck 2017-10-18 15:25:33 -05:00
LetterJay
8eb325ba1f icon 2017-10-18 15:15:47 -05:00
LetterJay
215681a23e AHHHHHHHHHHH 2017-10-18 08:10:12 -05:00
LetterJay
5760fbfc2f MORE CUSTOM ITEMS 2017-10-18 08:07:31 -05:00
LetterJay
cc96777b6b wrong filepath 2017-10-16 16:46:02 -05:00
LetterJay
1c807d8bb8 donation item 2017-10-16 16:45:33 -05:00
LetterJay
7feae419a1 Merge pull request #3421 from deathride58/consensualaphro
Make Crocin and Hexacrocin require arousal to be on to have lewd effects
2017-10-16 10:39:50 -04:00
deathride58
9799fb071a tfw autotab 2017-10-15 19:28:03 -04:00
deathride58
0cdf695c42 makes crocin and hexacrocin require arousal to be on to have an effect 2017-10-15 19:19:43 -04:00
deathride58
dc7f43d72c lets it actually compile 2017-10-15 02:16:13 -04:00
deathride58
bc12f646ed adds sounds to dogborg pounce 2017-10-15 02:10:01 -04:00
deathride58
d6d9c1e1a8 bluh 2017-10-15 01:01:20 -04:00
deathride58
38d139205d wooooooork 2017-10-15 00:53:35 -04:00
deathride58
fe5db1194a fuk 2017-10-15 00:46:45 -04:00
deathride58
47195cdbf0 INTENSE BORGO BALANCE TWEAKS 2017-10-15 00:30:22 -04:00
deathride58
5ea5dc40df hos ded 2017-10-14 03:42:08 -04:00
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