shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,644 Commits 5 Branches 0 Tags
9d312d7fef6d54cd63aef7b1bbfbd450bf853fb0
Commit Graph

21203 Commits

Author SHA1 Message Date
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
timothyteakettle
a4cc54781f implements isfood helper 2020-04-17 01:45:15 +01:00
Timothy Teakettle
aa6d6883e3 remove a random 'r' 2020-04-17 01:34:46 +01:00
Timothy Teakettle
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
Timothy Teakettle
e024393962 secret sauce doesn't give a second moodlet because that's dumb 2020-04-13 17:12:40 +01:00
Timothy Teakettle
ea8d43281e swap & for && 
woops

Co-Authored-By: Lin <linzolle@gmail.com>
 2020-04-10 03:21:06 +01:00
Timothy Teakettle
4c4e110375 imagine making it compile 2020-04-09 20:16:55 +01:00
Timothy Teakettle
951732c361 make secret sauce work on customizables 2020-04-09 20:12:02 +01: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
d985ea8c84 more quality 2020-04-09 02:51:32 +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
Lin
8379169b81 Merge pull request #11476 from kevinz000/shield_refactor 
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
 2020-04-07 20:47:15 +00:00
Lin
395d33e54c Merge pull request #11766 from Ghommie/Ghommie-cit699 
Bringing back accidentally reverted solar panel fixes.
 2020-04-07 19:59:48 +00:00
kevinz000
3901049c0d Update shields.dm 2020-04-07 12:50:01 -07:00
kevinz000
8b2132317b Ports a rewritten version of BAYSTRUMENTS (#11680) 
* bay instruments

* k

* AAA

* remove that

* changes

* Update _instrument_key.dm

* safety nets

* @ghommie fixed

* volume

* Update item.dm

* Update item.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-07 15:21:50 +02:00
Putnam3145
dad6ddb042 Merge pull request #11764 from Ghommie/Ghommie-cit668 
Fixing spellcasting and edge cases.
 2020-04-07 02:50:24 -07:00
Putnam3145
536934d1e2 Merge pull request #11770 from Kraseo/i-hate-slimes 
The contractor pod now gives regen jelly instead of omnizine
 2020-04-07 02:43:33 -07:00
kevinz000
557df9f21a Merge pull request #11755 from Trilbyspaceclone/patch-335 
Corrects plastic knife damage
 2020-04-07 02:00:35 -07:00
kevinz000
9c0567027b Merge pull request #11768 from timothyteakettle/uplinks-population-update 
uplink content updates with the current population
 2020-04-07 01:59:58 -07:00
kevinz000
029f8ff698 Merge pull request #11763 from necromanceranne/popcap_time 
Pop caps Sleeping Carp and Rising Bass to 30 players.
 2020-04-07 01:58:14 -07:00
kevinz000
ef2eaf2233 Merge pull request #11753 from KathrinBailey/Small-&-Snug-Changes 
They put me in a padded cell for spriting and porting.
 2020-04-07 01:56:21 -07:00
Kraseo
f88d36addf quirky ass slime roundstart races 2020-04-07 01:12:21 +02:00
kevinz000
287fbba4b8 Merge pull request #11758 from Putnam3145/add-ai-facing-message 
[s] Adds a message to AIs when they encounter a certain bug.
 2020-04-06 16:03:56 -07:00
kevinz000
ec237331a4 Merge pull request #11743 from Citadel-Station-13/Ghommie-patch-2-1 
Lil minesweeper edge case.
 2020-04-06 15:48:50 -07:00
kevinz000
ef0b81eabf Merge pull request #11744 from Citadel-Station-13/Ghommie-patch-4 
Fixed the epic nuke exploit
 2020-04-06 15:48:02 -07:00
kevinz000
a53096bdbf Merge pull request #11745 from Trilbyspaceclone/hide_and_seak 
Atomic PR 1 or 2 - Toilet Loot!
 2020-04-06 15:47:39 -07:00
kevinz000
d89170e441 Merge pull request #11748 from Trilbyspaceclone/patch-334 
Infested plasmamen now are miner type
 2020-04-06 15:47:00 -07:00
kevinz000
a80e6712b9 Merge pull request #11749 from Putnam3145/organ-conveyance 
Changed how scanners show organ damage.
 2020-04-06 15:46:49 -07:00
kevinz000
699f891166 Merge pull request #11750 from Putnam3145/pluoxium 
Makes miasma actually properly incorporate with air instead of using hacky spec heat stuff
 2020-04-06 15:46:09 -07:00
Timothy Teakettle
aabcfb580b discounts rerolling is bad 2020-04-06 19:49:06 +01:00
Timothy Teakettle
864f9b3244 except this times its in the right order 2020-04-06 18:59:48 +01:00
Timothy Teakettle
e8002ee449 imagine if it compiled and was less bad 2020-04-06 17:45:19 +01:00
Timothy Teakettle
3b322b9f7c population locked uplink items use current population 
yay?
 2020-04-06 17:34:34 +01:00
Ghommie
f6db5764e3 Bringing back accidentally reverted solar panel fixes. 2020-04-06 18:20:34 +02:00
Trilbyspaceclone
faf199fc35 Corrects Plasmamen sec jumpsuits not starting with MAXIUM tracking (#11747) 
* Update security.dm

* Update civilian_service.dm

* why is their so many more lines of the same code here?

* Update rnd.dm

* clears up sec file so that they all use a base

* Update curator.dm
 2020-04-06 17:53:43 +02:00
Ghommie
b92da66f04 Fixing spellcasting and edge cases. 2020-04-06 17:32:51 +02:00
necromanceranne
eece94caf3 puts a pop cap on the various martial arts. 2020-04-07 00:28:09 +10:00
Putnam
5f71efe07a Adds a message to the AI to reconnect, since this is a common bug 2020-04-05 22:41:50 -07:00
Ghom
33fc3ce1e0 Update spell.dm 2020-04-06 07:05:33 +02:00
Trilbyspaceclone
2ba342aa1a Update kitchen.dm 2020-04-05 23:11:25 -04:00
Putnam3145
5108bf1fc3 Stuff about power (#11664) 
* Overhauled how APCs work, I guess

* Makes cells drain like before
 2020-04-06 04:26:14 +02:00
KathrinBailey
adeb61180c big floof 2020-04-06 01:09:25 +01:00