 Dip
|
9acf8ffd40
|
merge conflict drinks.dmi
|
2020-10-29 13:50:19 -03:00 |
|
|
DahlularandGitHub
|
bbbd52a4a4
|
Merge pull request #623 from ArchieBeepBoop/numbertwo
Ports: GetComponent macros removal, and few other updates.
|
2020-10-29 10:30:33 -06:00 |
|
|
DahlularandGitHub
|
78e1327bca
|
Merge pull request #622 from ArchieBeepBoop/grill
Ports: The art of drunken captaining
|
2020-10-29 10:28:36 -06:00 |
|
|
DahlularandGitHub
|
2395ba69c9
|
Merge pull request #616 from Kabramen/more-kink-machines
more kink vendors for some ghost romes + better lighting for the hotel pool
|
2020-10-29 10:27:03 -06:00 |
|
|
QuoteFoxandGitHub
|
512ab2bd14
|
Merge pull request #624 from ArchieBeepBoop/alert
A Proper Warning for Ghost Role Appearance Loading
|
2020-10-29 04:45:39 +00:00 |
|
|
QuoteFoxandGitHub
|
b55c5f05a9
|
Merge pull request #625 from ArchieBeepBoop/pipening
The pipening
|
2020-10-29 04:44:34 +00:00 |
|
|
kevinz000andDip
|
82daa9b75e
|
Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3
Adds 8 more sci crates to cargo
|
2020-10-28 05:52:11 -03:00 |
|
|
kevinz000andDip
|
45f7b020c4
|
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
|
2020-10-28 05:48:57 -03:00 |
|
|
kevinz000andDip
|
89aa5852c8
|
Merge pull request #9226 from Trilbyspaceclone/unmodular_2
Unmodulars a few things + new sprite + new welder tank(unused
|
2020-10-28 05:32:56 -03:00 |
|
|
Dip
|
727b826d1b
|
better sprites
|
2020-10-28 05:12:36 -03:00 |
|
|
kevinz000andDip
|
f1f89cbb50
|
Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
The art of drunken captaining
|
2020-10-28 05:12:18 -03:00 |
|
|
kevinz000andDip
|
4a9d6a82ce
|
Merge pull request #9542 from Trilbyspaceclone/patch-231
Lowers Cargo most packs down to Pre- MK I Cargo rework*
|
2020-10-28 04:57:26 -03:00 |
|
|
kevinz000andDip
|
071f1cc6af
|
Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art
Code stuffs + more framework for cargo rework cuz atomic prs are good
|
2020-10-28 04:52:13 -03:00 |
|
|
kevinz000andDip
|
2983dfa445
|
Merge pull request #9211 from Trilbyspaceclone/Cargo_rebalance
[Atomic] Cargo rework - Mat selling nerf, addtion of grater gear to sell MK I
|
2020-10-28 04:39:39 -03: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 |
|
|
Dip
|
e7f549b57e
|
A proper alert for ghost role character appearance loading
|
2020-10-27 15:50:24 -03:00 |
|
|
kevinz000andDip
|
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 |
|
|
Dip
|
6fe0f126b1
|
better sprites
|
2020-10-27 13:34:12 -03:00 |
|
|
kevinz000andDip
|
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 |
|
|
QuoteFoxandGitHub
|
23c4a9be17
|
Merge pull request #617 from ArchieBeepBoop/cluwnef
Cluwne Targeting Fix
|
2020-10-27 02:37:38 +00:00 |
|
|
QuoteFoxandGitHub
|
1985f84ac8
|
Merge pull request #618 from ArchieBeepBoop/funnygenerator
TEG Power Feedback, Runtime and Engine Weights
|
2020-10-27 02:36:46 +00:00 |
|
|
QuoteFoxandGitHub
|
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 |
|
|
QuoteFoxandGitHub
|
88bf85f2ea
|
Merge pull request #619 from ArchieBeepBoop/fixesyee
Seemingly Fixes the offset blood overlay
|
2020-10-27 02:35:50 +00:00 |
|
|
QuoteFoxandGitHub
|
6d9b78d4e6
|
Merge pull request #620 from ArchieBeepBoop/penfix
Fixes the Sleepy Pen and Missing Reagent.
|
2020-10-27 02:35:32 +00:00 |
|
|
QuoteFoxandGitHub
|
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 |
|
|
deathride58andDip
|
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 |
|
|
DahlularandGitHub
|
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 |
|
|
Kabra_men
|
3c057c6e30
|
more kink vendors for some ghost romes + better lighting for the hotel pool
|
2020-10-24 23:50:07 -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 |
|
|
DahlularandGitHub
|
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 |
|
|
DahlularandGitHub
|
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 |
|
|
DahlularandGitHub
|
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 |
|
|
DahlularandGitHub
|
c486245611
|
Merge pull request #609 from quotefox/revert-584-Kromatose
Revert "Additional loadout polychromatic gear"
|
2020-10-23 16:40:14 -06:00 |
|
|
DahlularandGitHub
|
79f6e56852
|
Revert "Additional loadout polychromatic gear"
|
2020-10-23 16:40:02 -06:00 |
|
|
DahlularandGitHub
|
e73bc36749
|
Merge pull request #584 from BHyran/Kromatose
Additional loadout polychromatic gear
|
2020-10-23 16:29:37 -06:00 |
|