kevinz000 and GitHub
f6a5f92ff3
Merge pull request #11918 from Ghommie/Ghommie-cit689
...
nerf to biogenerator upgrades, removal of flour and glass bottles designs.
2020-04-25 16:59:38 -07:00
TrilbySpaceClone
c8b3032087
Merge branch 'master' into cube-world
2020-04-23 02:04:56 -04:00
Ghommie
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
Timothy Teakettle and GitHub
c5b8c45bf0
Merge branch 'master' into food-quality
2020-04-20 19:53:39 +01:00
kevinz000 and GitHub
893f57cb63
Merge pull request #11919 from Ghommie/Ghommie-cit690
...
Nerfing the bonus reagents from higher tier microwaves.
2020-04-20 11:34:53 -07:00
Trilbyspaceclone and GitHub
e311aafbc0
Update snacks_meat.dm
2020-04-19 22:21:07 -04:00
TrilbySpaceClone
d98f536003
map fix + cube fix
2020-04-19 19:38:23 -04:00
TrilbySpaceClone
3a78da9332
commit clearifcation
2020-04-19 19:18:19 -04:00
TrilbySpaceClone
25b1b889dc
amazing truely amazing
2020-04-19 19:09:20 -04:00
Lin and GitHub
d75e3f79bd
Merge pull request #11917 from Ghommie/Ghommie-cit688
...
Makes warm donk pockets cooling after 7 minutes canon again.
2020-04-19 16:52:33 +00:00
kevinz000 and GitHub
24370db5eb
Merge pull request #11930 from Ghommie/Ghommie-cit693
...
More ToS Compliance.
2020-04-18 19:33:10 -07:00
Ghommie
39aef14924
More ToS Compliance.
2020-04-19 02:40:58 +02:00
Ghom and GitHub
957e92ed8f
Update microwave.dm
2020-04-18 19:53:31 +02:00
Ghommie
cc16027d1a
Nerfing the bonus reagents from upgraded microwaves.
2020-04-18 19:30:14 +02:00
Ghommie
59f2b66fd9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit689
2020-04-18 18:44:46 +02:00
Ghommie
beb34321e7
nerf to biogenerator upgrades and purge of inorganic glass bottles designs.
2020-04-18 17:53:00 +02:00
Ghommie
8d4a67fedc
Makes warm donk pockets cooling after 7 minutes canon again.
2020-04-18 15:40:18 +02:00
Timothy Teakettle and GitHub
cd25a7c145
Merge branch 'master' into food-quality
2020-04-17 15:03:44 +01:00
Timothy Teakettle
9d312d7fef
small refactor to some stuff
...
quality_increase no longer passed to microwave_act because it's defined in obj/machinery/microwave
deepfryer code uses adjust_food_quality in a place where it didn't before
2020-04-17 13:59:48 +01:00
kevinz000 and GitHub
e84e6bface
Merge pull request #11857 from Trilbyspaceclone/race_drinks
...
Race drinks!
2020-04-17 05:20:53 -07:00
timothyteakettle
a4cc54781f
implements isfood helper
2020-04-17 01:45:15 +01:00
f821d33f44
change clamp to CLAMP
...
requested change, and i don't plan on subtypes with different effects based on food quality
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-04-17 01:32:42 +01:00
Trilbyspaceclone and GitHub
6f4a3fc179
wine to jello
2020-04-16 17:51:03 -04:00
Trilbyspaceclone and GitHub
8410d6f35f
Why are you like this coffee
2020-04-14 19:40:52 -04:00
TrilbySpaceClone
d49210fd48
Merge branch 'master' into race_drinks
2020-04-14 19:21:47 -04:00
TrilbySpaceClone
a46a6227a9
Finally done...
2020-04-14 19:11:53 -04:00
Linzolle
f828f4c4b7
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
2020-04-14 17:33:47 -05:00
TrilbySpaceClone
79a72a50d4
this is annoying, why is angel not defind as a race
2020-04-14 11:13:49 -04:00
Artur
f910a0fd32
Conflict fixes
2020-04-14 09:27:54 +03:00
TrilbySpaceClone
c5b1324d44
sprites and some basic code
2020-04-13 19:23:35 -04:00
Ghommie
42ff9b1d35
Final test, fixes and parent calls.
2020-04-14 01:23:26 +02:00
Ghommie
05a954f000
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
2020-04-13 02:01:01 +02:00
kevinz000 and GitHub
d60932ca5d
Merge pull request #11697 from Ghommie/Ghommie-cit655
...
Ports "Obliterates item_color: new washing machine functionality edition"
2020-04-12 16:16:37 -07:00
spookydonut
230e5fca20
fix everything
2020-04-11 15:32:09 +08:00
ea8d43281e
swap & for &&
...
woops
Co-Authored-By: Lin <linzolle@gmail.com >
2020-04-10 03:21:06 +01:00
ForrestWick
0a54f8a7a0
I'M SORRY MR GITHUB PLS DONT BEAT ME
2020-04-09 17:27:18 -05:00
Timothy Teakettle
1ffea14ee8
makes descriptions work
2020-04-09 19:53:14 +01:00
Timothy Teakettle
cfec83b8a2
what if butchering didnt suck!
2020-04-09 18:38:29 +01:00
Timothy Teakettle
7fe5bb71d7
more quality
2020-04-09 16:07:45 +01:00
Timothy Teakettle
47be942c92
more quality
2020-04-09 15:29:10 +01:00
Timothy Teakettle
97dcb9ed84
fried garbage is now better
2020-04-09 14:50:11 +01:00
Timothy Teakettle
7fba81f36e
people are more picky about food
2020-04-09 13:32:02 +01:00
timothyteakettle
20d4172030
more quality
2020-04-09 02:10:00 +01:00
timothyteakettle
a90f3d9d2b
woops
2020-04-09 01:46:47 +01:00
timothyteakettle
792be6e146
more food quality
2020-04-09 01:36:15 +01:00
timothyteakettle
bc6294baa9
i too, like food quality.
2020-04-09 01:10:34 +01:00
Artur
a903752ff9
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
2020-03-31 19:42:35 +03:00
Ghommie
c3faf94d8f
WIP
2020-03-30 05:29:39 +02:00
kevinz000 and GitHub
dd90d21f93
Merge pull request #11645 from Trilbyspaceclone/vaild
...
Et tu?
2020-03-28 15:58:56 -07:00
TrilbySpaceClone
879b626cd1
Et tu
2020-03-27 03:12:04 -04:00
