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

13887 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
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
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
Kraseo
f88d36addf quirky ass slime roundstart races 2020-04-07 01:12:21 +02: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
d89170e441 Merge pull request #11748 from Trilbyspaceclone/patch-334 
Infested plasmamen now are miner type
 2020-04-06 15:47:00 -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
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
Ghom
33fc3ce1e0 Update spell.dm 2020-04-06 07:05:33 +02: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
Putnam
31f4269515 Makes miasma generate correctly, reverts previous pluox change. 2020-04-05 03:23:58 -07:00
Trilbyspaceclone
7ed168da7f Update hivelord.dm 2020-04-05 03:05:41 -04:00
Putnam
1bf37dfb1b Doubles pluoxium specific heat 2020-04-04 22:04:37 -07:00
kevinz000
956c2a57bf Merge pull request #11729 from Ghommie/Ghommie-cit666 
Ports the VV Refactor by Kevinz.
 2020-04-04 19:19:25 -07:00
nik707
09c8bd40ec Merge pull request #11575 from EmeraldSundisk/coggers 
as of yet unfinished, being added in the background for ease of further development
 2020-04-04 13:18:07 -05:00
kevinz000
ed52038dda Merge pull request #11703 from Kraseo/public-tyranny 
Removes public mining from the game
 2020-04-04 07:39:13 -07:00
Kraseo
70859170c7 basically i fucking hate map merge conflicts 2020-04-04 16:32:45 +02:00
kevinz000
09a5e234d3 Merge pull request #11716 from kiwedespars/lightpink-nerf 
stabilized lightpink nerf - stabilized purple buff
 2020-04-04 07:22:47 -07:00
kevinz000
adad236997 Merge pull request #11728 from Citadel-Station-13/Ghommie-patch-1 
What was I hoping for again?
 2020-04-04 07:16:20 -07:00
kevinz000
2a2234483f Merge pull request #11727 from Putnam3145/vore-pacifist-fix 
Makes pacifists able to vore properly
 2020-04-04 07:15:54 -07:00
kevinz000
5e961e5e43 Merge pull request #11711 from Arturlang/skateboards_cool_again 
Buffs skateboards
 2020-04-04 07:15:29 -07:00
kevinz000
886f0d7500 Merge pull request #11726 from Ghommie/Ghommie-cit665 
Dwarfy message spam QoL.
 2020-04-04 07:11:02 -07:00
Ghom
dc6eb8b6c7 Badcode Mini Nukes Fix. 2020-04-04 13:58:48 +02:00
kevinz000
1987cc56a2 Merge pull request #11712 from Ghommie/Ghommie-cit661 
Porting the mutation conflict system, and resizing quantum realm fix.
 2020-04-03 21:58:58 -07:00
kevinz000
010ddb2bfb Merge pull request #11706 from Ghommie/Ghommie-cit660 
Minesweeper armageddon improvements
 2020-04-03 21:55:16 -07:00