Commit Graph

1143 Commits

Author SHA1 Message Date
Dip
6e989dfa51 fixes trash bag of holding bounty 2020-11-05 04:12:08 -03:00
Dip
65476a1b54 hypernob bounty 2020-11-05 03:56:37 -03:00
Dahlular
7524cf8927 Merge pull request #651 from ArchieBeepBoop/herewego2
refactoring and fixing altdisarm() exploits (ergo pushing people over directional windows etc).
2020-11-04 02:33:36 -07:00
Dip
93f79c20f6 blacklist some animals from being targeted by sentience events 2020-11-03 19:35:21 -03:00
kevinz000
3a84791e6c Merge pull request #9380 from Ghommie/Ghommie_cit212
refactoring and fixing altdisarm() exploits (ergo pushing people over directional windows etc).
2020-11-03 01:32:15 -03:00
Dahlular
21d973befa Merge pull request #647 from ArchieBeepBoop/herewegoagain
Ports Oracle UI framework, and updates UI for paper and disposal bins.
2020-11-02 20:56:24 -07:00
Dahlular
65abd166ce Merge pull request #646 from ArchieBeepBoop/zlevelstuff
Making the Reebe Smaller (And hopefully less laggy)
2020-11-02 20:54:49 -07:00
Dahlular
996ad3b677 Merge pull request #645 from ArchieBeepBoop/giftfix
Gift Blacklist: The Electric Sequel
2020-11-02 20:54:20 -07:00
Dahlular
60ab437ac8 Merge pull request #643 from Jay-Sparrow/Bug-fixin
Hardsuits must contain girth
2020-11-02 20:53:26 -07:00
Dip
5b96e008fe tinyfix 2020-11-02 18:38:18 -03:00
kevinz000
a86199c99f Merge pull request #9241 from Linzolle/oracleui
Ports Oracle UI framework, and updates UI for paper and disposal bins.
2020-11-02 18:14:44 -03:00
Ghom
eeb7b709bd new proc 2020-11-02 17:33:18 -03:00
kevinz000
70f60a02ab Merge pull request #8032 from deathride58/immersivetransitturfs
Makes transit areas physically throw you out of the transit area instead of simply teleporting you
2020-11-02 17:24:51 -03:00
Dip
c4680a7c28 the sequel 2020-11-02 15:01:08 -03:00
JaySparrow
8240f5d0a7 Big bits
Cram em in
2020-11-02 04:25:02 -06:00
QuoteFox
164bff70bb Merge pull request #642 from ArchieBeepBoop/giftfix
Jacqueline and the Christmas tree no longer have the *tiny chance* to spawn narsie or a singulo or ratvar.
2020-11-02 09:33:48 +00:00
Dip
8916a47eac let's fucking NOT 2020-11-02 06:26:01 -03:00
Dahlular
02b0e4c690 Merge pull request #641 from Jay-Sparrow/Bug-fixin
FUCK YOU LONE OP
2020-11-02 01:40:20 -07:00
JaySparrow
c033072884 FUCK YOU LONE OP
FUCK YOU FUCK YOU FUCK YOU FUCK YOU
2020-11-02 02:06:44 -06:00
Dahlular
af6ff73c29 Merge pull request #639 from ArchieBeepBoop/fuckcluwnes
Refactoring some of the cluwne's targeting and feedback system.
2020-11-02 00:36:03 -07:00
Dahlular
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
Dip
4e0ff0fd53 a 2020-11-01 20:33:12 -03:00
Dip
a8e8f24032 refactor 2020-11-01 20:08:54 -03:00
Dahlular
c9c2894df8 Merge pull request #631 from VladinXXV/superiormedicine
Superior medicines are actually superior now
2020-11-01 15:15:43 -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
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
Ghom
28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
kevinz000
b0a2ebdf3e Merge pull request #9960 from Ghommie/Ghommie-cit398
Ports custom reagent icecreams.
2020-10-30 04:27:59 -03:00
Dahlular
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
Dahlular
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
Dahlular
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
Dip
9acf8ffd40 merge conflict drinks.dmi 2020-10-29 13:50:19 -03:00
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
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
kevinz000
731b38c975 Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
2020-10-28 16:25:19 -03:00
BlackMajor
435aa3180f Merge pull request #9649 from Thalpy/JacqFixes
[Expedite][Halloween] Damnit Jacq stop bothering the AI
2020-10-28 16:07:25 -03:00
kevinz000
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
kevinz000
fa655a1b78 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2020-10-28 16:04:47 -03:00
kevinz000
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