Commit Graph

1089 Commits

Author SHA1 Message Date
Dahlular
bbbd52a4a4 Merge pull request #623 from ArchieBeepBoop/numbertwo
Ports: GetComponent macros removal, and few other updates.
2020-10-29 10:30:33 -06:00
Dahlular
78e1327bca Merge pull request #622 from ArchieBeepBoop/grill
Ports: The art of drunken captaining
2020-10-29 10:28:36 -06:00
Dip
fb7f3be4e4 icon layer 2020-10-27 16:58:33 -03:00
Dip
2ae2449f4b the pipening 2020-10-27 16:34:53 -03:00
kevinz000
2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259
Porting GetComponent macros removal, and few other updates.
2020-10-27 14:42:55 -03:00
kevinz000
7034e00e1c Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
The art of drunken captaining
2020-10-27 13:28:17 -03:00
QuoteFox
23c4a9be17 Merge pull request #617 from ArchieBeepBoop/cluwnef
Cluwne Targeting Fix
2020-10-27 02:37:38 +00:00
QuoteFox
1985f84ac8 Merge pull request #618 from ArchieBeepBoop/funnygenerator
TEG Power Feedback, Runtime and Engine Weights
2020-10-27 02:36:46 +00:00
QuoteFox
88bf85f2ea Merge pull request #619 from ArchieBeepBoop/fixesyee
Seemingly Fixes the offset blood overlay
2020-10-27 02:35:50 +00:00
QuoteFox
6d9b78d4e6 Merge pull request #620 from ArchieBeepBoop/penfix
Fixes the Sleepy Pen and Missing Reagent.
2020-10-27 02:35:32 +00:00
QuoteFox
653c79a0a8 Merge pull request #621 from ToonClyde/CitRP-jackets
CitRP Fluffy Jackets
2020-10-27 02:35:19 +00:00
ToonClyde
4207015199 CitRP Fluffy Jackets 2020-10-26 14:30:59 -07:00
Dip
6abb884fa4 fixes the sleepy pen and an invalid reagent 2020-10-26 18:11:06 -03:00
deathride58
d9db5e0aa9 Merge pull request #9246 from Linzolle/taur
some missing icons + sprite changes for taur suits
2020-10-25 21:18:42 -03:00
Dip
72a7f68b8a good god 2020-10-25 15:47:55 -03:00
Dip
bde27f9cc6 nuclear particle runtime fix 2020-10-25 06:59:37 -03:00
Dip
30d9c6054c Goon-Like TEG Feedback & Fun 2020-10-25 06:51:56 -03:00
Dahlular
802208e969 Merge pull request #556 from ArchieBeepBoop/roddupe
Ladders are now Better Ladders(tm)
2020-10-24 23:17:44 -06:00
Dip
a6ce59ec67 floor cluwne fix 2020-10-25 02:07:55 -03:00
Dahlular
a676000ed3 Merge pull request #612 from ArchieBeepBoop/runtimesgetsquashed
Fixes Meatwheat Poisoning, Wrong Simplemob Gibs and a runtime.
2020-10-23 23:50:41 -06:00
Dip
124bf72657 more runtimes, fixes wrong gibs and blood 2020-10-24 02:23:06 -03:00
Dahlular
6ed7131b25 Merge pull request #611 from Kabramen/polisuit-fix
Fix PR #584 and some additions for lockers and kink vendor
2020-10-23 21:21:25 -06:00
Dip
e162b8c36f fixes invisible skellingtons 2020-10-24 00:02:45 -03:00
Kabra_men
fd44d1a9fd Fix PR #584 and some additions for lockers and kink vendor 2020-10-23 23:19:34 -03:00
Dip
5470fdd25c squashing some runtimes 2020-10-23 21:15:06 -03:00
Dahlular
7aa0fccefa Merge pull request #608 from Kabramen/prosthetic-limb-quirk-revamp
Ports selectable prostethic limbs from Yog + quirk blacklist and two o…
2020-10-23 16:27:54 -06:00
Dahlular
3be0cb650a Merge pull request #607 from ArchieBeepBoop/becomemodular
Oh boy, it's another one of Archie's mini packs. - Energy Harvester, HoS Pet Port and a micro carp buff.
2020-10-23 16:25:53 -06:00
Dahlular
d82c9304f4 Merge pull request #604 from ArchieBeepBoop/master
[SPEEDMERGE] Fixes misaligned HE pipes & Listening Post Duplicates + TEG Burn chamber Optimizations
2020-10-23 16:24:29 -06:00
Dip
61fad3f3de debuff carps, dormammu has not accepted bargain 2020-10-23 19:18:03 -03:00
Dip
dc0a988d6c Energy Harvester V1 2020-10-23 05:55:58 -03:00
Kabra_men
dc35022521 fix hypersensitive so it actually works now 2020-10-22 02:29:39 -03:00
Kabra_men
64ee851bdf Ports selectable prostethic limb from Yog + quirk blacklist and two other new quirks 2020-10-22 01:23:27 -03:00
Dip
ddcf4e1434 Adds petting element to Lia and Cayenne, alongside mob holder. 2020-10-20 03:14:45 -03:00
Dip
9d8a729c51 Ports Lia / Micro Carp Buff? 2020-10-20 02:46:13 -03:00
Dip
feaa0ecd24 double examine is a no no 2020-10-19 19:03:12 -03:00
Dip
a479698c95 just in case this becomes a problem 2020-10-18 17:53:40 -03:00
Dip
9b7eee0a89 merge conflict 2020-10-18 16:54:22 -03:00
Dahlular
7586bd96c6 Merge pull request #601 from Chemlight/X-01_Buff
X-01 MultiPhase Energy Gun Buff
2020-10-18 13:24:38 -06:00
Dahlular
d0d9927b96 Merge pull request #599 from ArchieBeepBoop/becomemodular
SHITCODE: BECOME MODULAR
2020-10-18 13:23:38 -06:00
Dahlular
441f1cd449 Merge pull request #600 from Jay-Sparrow/Dynamic2
More dynamic
2020-10-18 13:22:15 -06:00
Dahlular
8546b30003 Merge pull request #597 from VladinXXV/master
Medical becomes 10x sexier
2020-10-18 13:19:03 -06:00
Dahlular
7e05bf7e62 Merge pull request #591 from ArchieBeepBoop/durabelt2
Turns the Durathread Belt into a general belt for all main professions in terms of allowed items
2020-10-18 13:18:34 -06:00
Dip
6163b7c963 GRUG SMASH RUNTIME 2020-10-18 04:34:21 -03:00
Dip
8a911e0064 RUNTIIIIME 2020-10-18 04:04:01 -03:00
Dip
6e8f722c27 runtime go YEET 2020-10-18 03:57:44 -03:00
Dip
8004fdc3e2 pipefix 2020-10-18 00:54:21 -03:00
kevinz000
2e75188a0b Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
2020-10-18 00:03:22 -03:00
Dip
c91a106b0d fixes and runtimes 2020-10-17 23:55:40 -03:00
Lin
1fb7d6ff90 bloodbankfix 2020-10-17 23:25:39 -03:00
Dip
682eb7b9b6 gotta make sure this works yo 2020-10-17 22:25:29 -03:00