 DahlularandGitHub
|
b2fb7d0d79
|
Merge pull request #640 from ArchieBeepBoop/revenant
Revenant Fixes & Balancing
|
2020-11-01 20:08:59 -07:00 |
|
Dip
|
2713df2455
|
makes revenants less shit tm
|
2020-11-01 22:15:41 -03:00 |
|
 DahlularandGitHub
|
0e65c65fc9
|
Merge pull request #635 from ArchieBeepBoop/bloodtypederp
Fixes Synthliz Bloodtype.
|
2020-11-01 15:16:09 -07:00 |
|
 DahlularandGitHub
|
c9c2894df8
|
Merge pull request #631 from VladinXXV/superiormedicine
Superior medicines are actually superior now
|
2020-11-01 15:15:43 -07:00 |
|
 DahlularandGitHub
|
33fa23a13f
|
Merge pull request #638 from ArchieBeepBoop/fuckcluwnes
Another hard return
|
2020-11-01 15:14:34 -07:00 |
|
Dip
|
6db43927c6
|
HAHA YEAH NO
|
2020-11-01 19:12:21 -03:00 |
|
Dip
|
c7c6b579d8
|
anotherone
|
2020-11-01 19:10:07 -03:00 |
|
Dip
|
859dfd24f5
|
synthliz bloodtype
|
2020-10-31 00:23:24 -03:00 |
|
 DahlularandGitHub
|
adb995f61a
|
Merge pull request #633 from ArchieBeepBoop/fixes2
Spooky meteors now only replace catstrophic instead of -every type- and also fixes two broken autobottler designs
|
2020-10-30 16:30:19 -06:00 |
|
Dip
|
ca0939c2f8
|
fixes the two broken autobottler designs
|
2020-10-30 15:06:25 -03:00 |
|
Dip
|
af751a7c41
|
Spooky meteors now only replace catastrophic
|
2020-10-30 15:01:02 -03:00 |
|
Vladin
|
dcdc153369
|
fixed code comments to be accurate
clean code and clean code comments are nice
|
2020-10-30 06:27:03 -04:00 |
|
Vladin
|
5356c63bd5
|
Superior medicine is actually superior
Effective threshold increased from 25 to 30
Less effective healing increased to match basic healing chems
|
2020-10-30 06:21:35 -04:00 |
|
 DahlularandGitHub
|
1a207aed7e
|
Merge pull request #630 from ArchieBeepBoop/newfood2
"Hey Archie, what if..." Ports that one massive food PR, Adds Grills and Monkey Energy
|
2020-10-30 02:49:08 -06:00 |
|
 GhomandDip
|
28cdb9c5f1
|
Oh no.
|
2020-10-30 05:30:15 -03:00 |
|
 kevinz000andDip
|
b0a2ebdf3e
|
Merge pull request #9960 from Ghommie/Ghommie-cit398
Ports custom reagent icecreams.
|
2020-10-30 04:27:59 -03:00 |
|
Dip
|
6b6ace1726
|
drinkfix
|
2020-10-30 04:21:03 -03:00 |
|
 DahlularandGitHub
|
ee0017721e
|
Merge pull request #627 from ArchieBeepBoop/spooky
The Spookening: Ports Jacqueline the Pumpqueen event + Dullahan and subsequent Fixes
|
2020-10-29 22:51:07 -06:00 |
|
 DahlularandGitHub
|
c567887a32
|
Merge pull request #628 from ArchieBeepBoop/cluwnereturn
Hard return on the cluwne if H is not the current_victim.
|
2020-10-29 22:48:50 -06:00 |
|
 DahlularandGitHub
|
5f257c785b
|
Merge pull request #629 from BoxyBoy/sizeCodeFixStuff
Size code examine text
|
2020-10-29 22:48:08 -06:00 |
|
BoxyBoy
|
f508e0557b
|
Better explanations
Changes a couple of comments in the if/else statement to better explain what it's doing.
|
2020-10-29 22:34:54 -06:00 |
|
BoxyBoy
|
75f967bd88
|
Character Size Examine Text
Adds a line of examine text when examining a character and gives an aproximation of their height.
|
2020-10-29 21:55:42 -06:00 |
|
Dip
|
4d64275e84
|
HARD return
|
2020-10-30 00:04:59 -03:00 |
|
 DahlularandGitHub
|
6b4d1268a2
|
Merge pull request #626 from ArchieBeepBoop/cargo4
Port: The Cargo Rework MK II And all of its pre-requisites.
|
2020-10-29 11:01:14 -06:00 |
|
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 |
|
Dip
|
68665d2006
|
we're crashing the server with no survivors
|
2020-10-28 17:09:46 -03:00 |
|
Dip
|
87611d624d
|
PLEASE.
|
2020-10-28 17:01:28 -03:00 |
|
Dip
|
1006fb3c7e
|
mood runtime
|
2020-10-28 16:57:47 -03:00 |
|
Dip
|
138b7a0aa0
|
this dullahan bullshit is going to make me kill myself
|
2020-10-28 16:29:53 -03:00 |
|
 kevinz000andDip
|
731b38c975
|
Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
|
2020-10-28 16:25:19 -03:00 |
|
 BlackMajorandDip
|
435aa3180f
|
Merge pull request #9649 from Thalpy/JacqFixes
[Expedite][Halloween] Damnit Jacq stop bothering the AI
|
2020-10-28 16:07:25 -03:00 |
|
 kevinz000andDip
|
48051d5dd2
|
Merge pull request #9635 from Thalpy/JacqFixes
[Expedite] [Halloween] A few fixes for Jacqueline and Barth.
|
2020-10-28 16:06:55 -03:00 |
|
 kevinz000andDip
|
fa655a1b78
|
Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
|
2020-10-28 16:04:47 -03: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 |
|