Commit Graph

20183 Commits

Author SHA1 Message Date
Trilbyspaceclone
2a33dcd333 Add files via upload 2019-04-29 17:45:48 -04:00
Trilbyspaceclone
1a8a699445 Add files via upload 2019-04-29 17:44:32 -04:00
Trilbyspaceclone
079dc70dc2 Delete food.dmi 2019-04-29 17:44:05 -04:00
Trilbyspaceclone
b0fe41ea96 Merge pull request #36 from Citadel-Station-13/master
updated
2019-04-29 17:38:30 -04:00
CitadelStationBot
ae2b3797a6 Automatic changelog generation for PR #8277 [ci skip] 2019-04-25 06:35:01 -05:00
kevinz000
6646d39c89 Merge pull request #8277 from BurgerLUA/NoRaceChange
Significantly Reworks the Wizard Transformation Event
2019-04-25 04:34:59 -07:00
CitadelStationBot
7b94b5df51 Automatic changelog generation for PR #8279 [ci skip] 2019-04-25 06:34:12 -05:00
kevinz000
fd7c5a9568 Merge pull request #8279 from Trilbyspaceclone/patch-107
Fixes deathriplys armor being halfed
2019-04-25 04:34:09 -07:00
CitadelStationBot
bb47bc7cf9 Automatic changelog generation for PR #8261 [ci skip] 2019-04-25 06:20:05 -05:00
kevinz000
a23b999cc3 Merge pull request #8261 from Trilbyspaceclone/patch-101
Makes all mechs sell for legit price
2019-04-25 04:20:02 -07:00
CitadelStationBot
11ba5ee3fd Automatic changelog generation for PR #8264 [ci skip] 2019-04-25 06:19:38 -05:00
kevinz000
70bb99410e Merge pull request #8264 from Trilbyspaceclone/patch-102
Reblances miner vender suit vouch and more
2019-04-25 04:19:35 -07:00
kevinz000
6ce3a0150f Merge pull request #8242 from Trilbyspaceclone/patch-99
Give some blob things basic armor
2019-04-25 04:18:21 -07:00
BurgerLua
b0a93cf790 retweaked the event instead of removing it 2019-04-23 11:51:00 -07:00
Trilbyspaceclone
ff29ade943 Hairly request 2019-04-23 12:09:58 -04:00
Trilbyspaceclone
823dd1a98a Update ripley.dm 2019-04-23 04:40:21 -04:00
Trilbyspaceclone
31f3a16777 *No gps* 2019-04-23 02:43:23 -04:00
Trilbyspaceclone
dbdd37430a Kev requests... 2019-04-23 02:42:18 -04:00
BurgerLua
d05afafcd1 Unironically removes the race change event 2019-04-22 23:40:34 -07:00
Trilbyspaceclone
1aa312822a Sure 2019-04-23 02:34:14 -04:00
Trilbyspaceclone
415461d736 Forgot bomb armor 2019-04-23 02:32:07 -04:00
Trilbyspaceclone
073684b7bc As Kev requested 2019-04-23 02:30:55 -04:00
CitadelStationBot
603c4b9d27 Automatic changelog generation for PR #8247 [ci skip] 2019-04-22 23:41:34 -05:00
kevinz000
64202b1444 Merge pull request #8247 from Poojawa/custom-race
Custom Species names
2019-04-22 21:41:31 -07:00
kevinz000
8b54d33286 Merge pull request #8215 from Trilbyspaceclone/Sush
[Ready] Sushi!
2019-04-22 21:40:28 -07:00
CitadelStationBot
2f3b84378f Automatic changelog generation for PR #8265 [ci skip] 2019-04-22 23:38:35 -05:00
kevinz000
6892e8d01e Merge pull request #8265 from Trilbyspaceclone/patch-103
Reblances goliath stun.
2019-04-22 21:38:33 -07:00
kevinz000
333f758e30 Merge pull request #8105 from Trilbyspaceclone/patch-76
[Ready] Makes transformation slings have a loundess of 2 factor
2019-04-22 21:34:50 -07:00
CitadelStationBot
c0f336f09f Automatic changelog generation for PR #8260 [ci skip] 2019-04-22 23:32:17 -05:00
kevinz000
6be4b7b969 Merge pull request #8260 from Trilbyspaceclone/cakes
4 more cakes!
2019-04-22 21:32:15 -07:00
kevinz000
f05b326f15 Merge pull request #8250 from Trilbyspaceclone/patch-100
[Fix] Lowers pda sounds as well as make them respect ringer off
2019-04-22 21:31:38 -07:00
kevinz000
02083e1605 Merge pull request #8273 from Poojawa/screaming
Let's make sure all monsters will attack I guess
2019-04-22 21:22:17 -07:00
Poojawa
fe1692eef3 t a b 2019-04-21 01:57:12 -05:00
Poojawa
b524c6741d double checking my work 2019-04-21 01:56:45 -05:00
Poojawa
df057544f2 Merge branch 'master' into screaming 2019-04-20 23:33:23 -05:00
Poojawa
ae7ce39f62 aaaAAAAaaaa 2019-04-20 23:28:43 -05:00
kevinz000
f38546b21a Merge pull request #8230 from Trilbyspaceclone/patch-97
[Ready] Makes Mentor chat have better colors as not to confuse Mentors from chat vs helping
2019-04-20 16:40:09 -07:00
CitadelStationBot
65d219ac40 Automatic changelog generation for PR #8182 [ci skip] 2019-04-20 18:38:22 -05:00
kevinz000
939bbbe3e7 Merge pull request #8182 from deathride58/optimizeshearersinview
Optimizes get_hearers_in_view by caching the results of view() in the proc
2019-04-20 16:38:20 -07:00
kevinz000
8c5db62542 Merge pull request #8244 from Poojawa/iv-dripper-punctures
Adds a can_inject check to IV Drips
2019-04-20 16:37:13 -07:00
kevinz000
d4636ddeb8 Merge pull request #8249 from Poojawa/mask-checkers
Headgear is more aggressive in setting normal style stuff
2019-04-20 16:36:26 -07:00
CitadelStationBot
cd3edb22d0 Automatic changelog generation for PR #8258 [ci skip] 2019-04-20 18:36:03 -05:00
kevinz000
b35c366516 Merge pull request #8258 from BurgerLUA/VentClogTweak
Rework of Vent Clog Event
2019-04-20 16:36:01 -07:00
kevinz000
e521a5abd6 Merge pull request #8217 from Trilbyspaceclone/patch-95
[Ready] Makes alien alloy be able to unlock - Alien Alloy.
2019-04-20 16:33:51 -07:00
kevinz000
901e748675 Merge pull request #8254 from Poojawa/the-great-vore-escape
clears blindness on vore OOC escape
2019-04-20 16:31:59 -07:00
kevinz000
60bc278418 Merge pull request #8227 from Trilbyspaceclone/patch-96
Magrifle/Magpistol nonlethals now do 2 damage rather than 0
2019-04-20 16:30:58 -07:00
CitadelStationBot
8e2353c058 Automatic changelog generation for PR #8259 [ci skip] 2019-04-20 18:29:37 -05:00
kevinz000
6291185422 Merge pull request #8259 from deathride58/fuckpaicircuits
Minor circuit balance tweaks - limits locomotion circuits to jogging speed and doubles the complexity of mmi/pai connector circuits
2019-04-20 16:29:35 -07:00
Trilbyspaceclone
7a3f8704a2 Update goliath.dm 2019-04-20 14:16:30 -04:00
Trilbyspaceclone
6dc8faf533 Update machine_vending.dm 2019-04-20 14:08:25 -04:00