Commit Graph

261 Commits

Author SHA1 Message Date
CygnusB
ad8a067015 agonyyyy 2020-12-01 18:09:00 -03:00
Dahlular
ec85829dca Merge pull request #725 from Oposshim/another-nanotrasen-muh-lore-tweak
Posshim's fix - of a fix - of a fix - of a fix
2020-11-30 09:49:21 -07:00
Oposshim
c8cf5e2fb7 Posshim's fix - of a fix - of a fix - of a fix
I cannot be trusted with PRs.

I missed / messed up two things from the last pull.
2020-11-30 11:30:55 -05:00
Dip
bcd3df5bd4 Inconsistency with the light eater and marker beacons 2020-11-27 15:23:35 -03:00
Dahlular
59abd14af6 Merge pull request #705 from ArchieBeepBoop/medbotfixing
Medbots are FINALLY smarter and will no longer outright kill slimes
2020-11-21 23:04:16 -07:00
Dahlular
fa5e05c44c Merge pull request #702 from ArchieBeepBoop/idbullshitpart3
Cleaning up ID Console code and other tweaks - The "I want to die" edition
2020-11-21 23:00:50 -07:00
Dip
4a09ed3822 Medbots are now smarter 2020-11-21 03:24:51 -03:00
kevinz000
c7db7cb2be The ID Code Cleanup and Fixening (tm) 2020-11-20 20:55:27 -03:00
Archie
90d8f67e99 Prevents dead people's cybernetic tongue from speaking for them. 2020-11-20 17:11:00 -03:00
Dahlular
2e58f6ebb7 Merge pull request #687 from ArchieBeepBoop/mutation
Fixes mutations runtiming left and right / owner not being set in mutation
2020-11-19 23:22:12 -07:00
Dahlular
79d678fe19 Merge pull request #678 from ArchieBeepBoop/teleportfixes
[Testmerge] Mass fixing Teleporter issues + Implant Location Refactoring and Fixes
2020-11-19 23:18:37 -07:00
kevinz000
96a09b1793 Merge pull request #11578 from Ghommie/Ghommie-cit636
Fixing owner not being set in mutation/on_aquiring.
2020-11-15 19:19:44 -03:00
Dahlular
a6da8a4373 Merge pull request #676 from ArchieBeepBoop/radiationresonance
[Proposal] Makes radiation resonance less undesirable.
2020-11-13 19:09:10 -07:00
kevinz000
4bd370532d Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
2020-11-12 03:53:27 -03:00
Dip
2b6448cab4 Makes radiation resonance less undesirable. 2020-11-12 02:29:42 -03:00
BlackMajor
8d914d0b21 Number one 2020-11-10 17:51:07 -03:00
QuoteFox
25ed29555c Merge pull request #670 from ArchieBeepBoop/ailaws
More feedback for having your laws changed
2020-11-10 16:59:37 +00:00
QuoteFox
1b3d33388a Merge pull request #671 from ArchieBeepBoop/indicators
Typing Indicators
2020-11-10 16:58:24 +00:00
Dahlular
cbdce23df4 Merge pull request #652 from ArchieBeepBoop/virofixes
[TESTMERGE] The Viro Rework done right? Ports a load of viro, (sentient) disease, symptoms code updates from tg.
2020-11-10 01:54:24 -07:00
Dip
6eebc1d649 Typing Indicators 2020-11-10 01:52:06 -03:00
Dip
eee8867076 big bold 2020-11-09 20:19:29 -03:00
Dip
5a52a8ec09 extra , fuck 2020-11-09 19:54:01 -03:00
Dip
906d23f7cc More feedback for having your laws changed 2020-11-09 19:51:30 -03:00
Dip
3f5d4fe6d5 Right 2020-11-09 00:23:07 -03:00
Dip
5ab0752975 Prevents slimes from attacking other slimes + Fixes invincible runtime 2020-11-09 00:04:53 -03:00
Dip
1ef899440b yeah also this 2020-11-04 17:12:18 -03:00
kevinz000
752a3d9bcc Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2020-11-03 01:51:18 -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
Dip
a8e8f24032 refactor 2020-11-01 20:08:54 -03: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
Ghom
28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -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
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
kevinz000
fa655a1b78 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2020-10-28 16:04:47 -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
Dip
a6ce59ec67 floor cluwne fix 2020-10-25 02:07:55 -03:00
Dip
124bf72657 more runtimes, fixes wrong gibs and blood 2020-10-24 02:23:06 -03:00
Dip
e162b8c36f fixes invisible skellingtons 2020-10-24 00:02:45 -03:00
Dip
5470fdd25c squashing some runtimes 2020-10-23 21:15:06 -03: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
Dip
61fad3f3de debuff carps, dormammu has not accepted bargain 2020-10-23 19:18:03 -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