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 |
|
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
|
9c13864b8b
|
Merge pull request #615 from ArchieBeepBoop/pets
Energy Harvester Fixes + HoS Pet to Active Rotation Stations
|
2020-10-27 02:36:23 +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
|
c24cc90b3f
|
whoops
|
2020-10-25 06:53:12 -03:00 |
|
Dip
|
30d9c6054c
|
Goon-Like TEG Feedback & Fun
|
2020-10-25 06:51:56 -03:00 |
|
Dip
|
d7a7901243
|
Merge remote-tracking branch 'upstream/master'
|
2020-10-25 03:29:47 -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 |
|
Dip
|
84c8e0b5c9
|
Lia for Pubby
|
2020-10-24 17:40:33 -03:00 |
|
Dip
|
febbd3bff4
|
Adds Lia to the HoS office
|
2020-10-24 17:35:14 -03:00 |
|
Dip
|
e36d922f16
|
fixes
|
2020-10-24 04:14:10 -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 |
|
Dahlular
|
d9d3e56e2d
|
Merge pull request #610 from ArchieBeepBoop/runtimesgetsquashed
Fixing some runtimes and invisible skeletons
|
2020-10-23 21:20:47 -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
|
c486245611
|
Merge pull request #609 from quotefox/revert-584-Kromatose
Revert "Additional loadout polychromatic gear"
|
2020-10-23 16:40:14 -06:00 |
|
Dahlular
|
79f6e56852
|
Revert "Additional loadout polychromatic gear"
|
2020-10-23 16:40:02 -06:00 |
|
Dahlular
|
e73bc36749
|
Merge pull request #584 from BHyran/Kromatose
Additional loadout polychromatic gear
|
2020-10-23 16:29:37 -06: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 |
|
Dahlular
|
0719169693
|
Merge pull request #603 from ArchieBeepBoop/gibspawner
Mass Merge - The Blood System Rework & A metric fuckton of runtime fixes
|
2020-10-23 16:20:26 -06:00 |
|
Dip
|
61fad3f3de
|
debuff carps, dormammu has not accepted bargain
|
2020-10-23 19:18:03 -03:00 |
|
Dahlular
|
9d1c810742
|
Merge pull request #602 from Tename/vale
Questionable attempt at porting Vale borgs
|
2020-10-23 16:15:14 -06:00 |
|
Dip
|
dc0a988d6c
|
Energy Harvester V1
|
2020-10-23 05:55:58 -03:00 |
|
Dip
|
f9159c3d6e
|
TEG heat isolation
|
2020-10-22 20:15:15 -03:00 |
|
Dip
|
3205f2ba5e
|
posters, lighter replacement (slime was shit), toolbox
|
2020-10-22 14:41:04 -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 |
|
Dahlular
|
f706f16a31
|
Merge pull request #606 from Chemlight/Robotic-screech-
Synthetic Lizard Scream
|
2020-10-19 10:07:59 -06:00 |
|
Chemlight
|
bbd09dc271
|
Synthetic Lizard Scream
The synthetic lizard can now do the silicon scream.
|
2020-10-19 04:24:09 -07: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 |
|