Commit Graph

18698 Commits

Author SHA1 Message Date
deathride58
ff279bacef Merge pull request #7644 from Poojawa/patch-1
Adds more salt to the mill
2018-10-12 06:45:51 -04:00
deathride58
29d62bc2a8 Merge pull request #7641 from Poojawa/suitpass
fixes mining suits, wintercoats
2018-10-10 23:59:52 -04:00
CitadelStationBot
d3c9b24707 Automatic changelog generation for PR #7625 [ci skip] 2018-10-10 22:59:32 -05:00
deathride58
a22d7cc2ea Merge pull request #7625 from Poojawa/patch-2
Medihound Tweaks and Sound Preference improvements
2018-10-10 23:59:29 -04:00
Poojawa
3242e490da Update chat_commands.dm 2018-10-10 06:12:34 -05:00
Poojawa
c23402c790 Adds more salt to the mill 2018-10-10 06:08:48 -05:00
CitadelStationBot
7367effd3a Automatic changelog generation for PR #7630 [ci skip] 2018-10-10 01:03:04 -05:00
deathride58
31ba174020 Merge pull request #7630 from Tupinambis/NukeOpsStart
The cooler nuke op base (featuring more air)
2018-10-10 02:03:02 -04:00
deathride58
117342b9db Merge pull request #7636 from nik707/mapfixes
Pass one of map fixing post sync.
2018-10-10 02:02:46 -04:00
Poojawa
08d691d600 fixes some ear states since I'm here 2018-10-09 18:25:51 -05:00
Poojawa
8bcfeff15d Fixes bloody shoes effect 2018-10-09 18:02:02 -05:00
Poojawa
fc05caaa45 updates example sprite for Digi legs 2018-10-09 17:48:57 -05:00
Poojawa
56287f93b7 fixes mining suits, wintercoats 2018-10-09 17:39:38 -05:00
Poojawa
c638a2783a improves accuracy of playsounds
removes excessively defined for (var/mob/living/M in contents) that didn't need it
2018-10-08 20:43:26 -05:00
deathride58
bac9d0ad1b Merge pull request #7633 from Poojawa/meme-markings
Fixes Guilmon features
2018-10-08 18:52:03 -04:00
deathride58
15c33a97f8 Merge pull request #7634 from Poojawa/Ear-layers
Splits mam_bodyparts up
2018-10-08 18:50:01 -04:00
CitadelStationBot
08f08a1581 Automatic changelog generation for PR #7632 [ci skip] 2018-10-08 17:49:14 -05:00
deathride58
ab4eae403a Merge pull request #7632 from Poojawa/Digitigrade-suits
Digitigrade suits
2018-10-08 18:49:12 -04:00
CitadelStationBot
2f058142ec Automatic changelog generation for PR #7627 [ci skip] 2018-10-08 17:46:23 -05:00
deathride58
5101377408 Merge pull request #7627 from Poojawa/patch-3
APC have Damage Resistance, Health, and armor buffs
2018-10-08 18:46:21 -04:00
CitadelStationBot
e86a6df6f6 Automatic changelog generation for PR #7631 [ci skip] 2018-10-08 17:45:44 -05:00
nik707
b868ec0945 adds fun and inventive ways for harold to kill himself (#7631) 2018-10-08 15:45:42 -07:00
nik707
dcd5141d9b fixes various map bugs PASS1 2018-10-08 12:54:56 -05:00
Poojawa
c6d6da3bb4 fuckin' merge memes 2018-10-08 09:18:41 -05:00
Poojawa
24dcf821a1 Update mine_items.dm 2018-10-08 02:39:08 -05:00
Poojawa
7bd3eed030 Merge branch 'master' into patch-2 2018-10-08 02:38:11 -05:00
CitadelStationBot
8fdec964d1 Automatic changelog generation for PR #7626 [ci skip] 2018-10-07 13:36:09 -05:00
deathride58
d02a781632 Merge pull request #7626 from Poojawa/blue-alarms
Blue air alarms
2018-10-07 14:36:07 -04:00
Poojawa
f19dec2398 Splits mam_bodyparts up 2018-10-07 13:24:31 -05:00
Poojawa
ad2669f785 Fixes Guilmon features 2018-10-07 06:23:00 -05:00
Poojawa
99cb49fd7b I suspect I'll have a few more west facing mistakes, oops 2018-10-07 05:47:45 -05:00
Poojawa
aa8d29fc53 Ensures suit.dm bandits are exempted 2018-10-07 05:36:56 -05:00
Poojawa
a05acf5c7e Finishes sprites, ensures proper equipping
Also blacklists customs that aren't in suit.dmi yet
2018-10-07 04:56:22 -05:00
Tupinambis
0b097338fa Please for the love of fuck remove cit map files or triple gay. 2018-10-06 21:26:19 -05:00
Tupinambis
c2effc9173 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into NukeOpsStart 2018-10-06 21:22:22 -05:00
Tupinambis
10a887995f Makes the nuke op base cooler and more immersive and such. Enjoy 2018-10-06 19:56:25 -05:00
deathride58
f3e166a8c7 Merge pull request #7614 from Poojawa/patch-1
Fixes Black Tango dress for digitigrade
2018-10-06 19:23:44 -04:00
deathride58
5440b68634 Merge pull request #7623 from nik707/MAnerfs
Nerf Mining Armor (FEEDBACK NEEDED.)
2018-10-06 19:23:17 -04:00
Poojawa
bfd3323a63 some other east facing sprites. 2018-10-06 09:19:59 -05:00
Poojawa
756f853492 Digitigrade suits base line
All suits have N/S at this point, some have E/W. god this is going to be awful.
2018-10-06 04:43:07 -05:00
Poojawa
a987caabb4 better ambient color to match 2018-10-05 22:20:37 -05:00
Poojawa
5900eed70b Revert "Sound prefs def should work this time, holy fuck"
This reverts commit 22c667f408.
2018-10-05 15:44:42 -05:00
Poojawa
21d31c5763 Gives APCs inherent damage resistance/deflection 2018-10-05 15:30:51 -05:00
Poojawa
e847f5bb33 Increases APC health and damage resistance values 2018-10-05 15:26:10 -05:00
Poojawa
1a2e327bc6 recolors air alarm green status to blue 2018-10-05 15:20:12 -05:00
Poojawa
bcabdaa0dc Let's do this better
Make it initialize and clean up processing memes m'yes. Icons update properly now too, how about that.
2018-10-05 09:34:01 -05:00
Poojawa
b09ed6ffb5 Merge remote-tracking branch 'refs/remotes/origin/indigestion-complaints' into patch-2 2018-10-05 08:25:34 -05:00
Poojawa
1f3c2d6961 oops 2018-10-05 08:24:52 -05:00
Poojawa
0b245e5eb0 Medihound Tweaks 2018-10-05 08:08:14 -05:00
nik707
1532802511 fixes dumb 2018-10-04 22:04:12 -05:00