Commit Graph

282 Commits

Author SHA1 Message Date
QuoteFox
e6a7a295d2 Wash cum bug again
Muliple stacks break it..
2020-12-24 19:39:41 +00:00
QuoteFox
f9d7b255b1 Cum over partner option
Cum over partner option
2020-12-24 19:10:47 +00:00
Anthony Rodriguez
b48fa01953 Adds a *squeak emote 2020-12-23 21:08:01 -08:00
QuoteFox
7fb3ed17f7 Merge pull request #755 from ArchieBeepBoop/reagentsagain
Ports reagents id removal and typepath usage
2020-12-23 17:48:37 +00:00
Lin
b9fe810525 Merge pull request #9959 from Ghommie/Ghommie-cit397
patching some combat mode edge cases and issues.
2020-12-20 11:32:28 -03:00
Lin
a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
Dahlular
4fb6256a99 Revert "Borg expander + VTEC fix" 2020-12-06 13:44:28 -07:00
Dahlular
047e087c0e Merge pull request #747 from ArchieBeepBoop/typing
No more typing indicators while dead
2020-12-06 13:35:14 -07:00
Dahlular
3800442a32 Merge pull request #727 from ArchieBeepBoop/reagents
Ports "Refactors can_see_reagents"
2020-12-06 13:31:50 -07:00
Dahlular
40b1495ff3 Merge pull request #714 from DragonTrance/borgupgrade-fix
Borg expander + VTEC fix
2020-12-06 13:22:11 -07:00
Dip
c6e0403c78 No more typing indicators while dead 2020-12-06 13:36:43 -03:00
QuoteFox
6cd58a7c28 Revert "Remove Height Examine text"
This reverts commit 5610ed21f6.
2020-12-05 04:13:00 +00:00
QuoteFox
5610ed21f6 Remove Height Examine text
Remove Height Examine text
2020-12-05 03:56:44 +00:00
Dahlular
ede0632fbf Merge pull request #726 from MalricB/euthanasia
Ports vampires. Or, bloodsuckers, rather.
2020-12-03 19:18:47 -07:00
Lin
9677bb5104 Merge pull request #10242 from Ghommie/Ghommie-cit483
Ports "Refactors can_see_reagents"
2020-12-02 00:57:14 -03:00
Dahlular
02b1aba9d7 Merge pull request #709 from ArchieBeepBoop/blacklistfix1
Re-Porting the Trait Blacklist System (Fixes broken respawn traits)
2020-12-01 20:14:06 -07:00
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
DragonTrance
536d0db119 stupid mobile fat fingered 2020-11-22 17:36:35 -07:00
DragonTrance
f9488ea660 5 2020-11-22 14:23:38 -07:00
DragonTrance
274f49531f 4 2020-11-22 14:22:38 -07:00
DragonTrance
5d2afad223 3 2020-11-22 14:21:42 -07: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
2a5c61dc45 fuck me 2020-11-22 01:29:01 -03: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