Commit Graph

204 Commits

Author SHA1 Message Date
QuoteFox
092a7fa5a1 Merge pull request #804 from quotefox/sexhud
New HTML arousal hud, with contextal options, plus new lewd features.
2021-01-02 14:34:31 +00:00
QuoteFox
333f410476 New Arousal Hud
New Arousal Hud, much more user accessable with contextal options.
2021-01-02 13:39:17 +00:00
Chloe Carver-Brown
c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +00:00
Chloe Carver-Brown
1685663b80 Let IPCs and SynthLiz be injected by nanites 2020-12-31 16:46:14 +00:00
Archie
4123b5f49f Hopefully fixes phobia? 2020-12-30 03:59:36 -03:00
QuoteFox
f73a8f7f24 Revert "DNC is now worth no points."
This reverts commit cb0d36aaf3.
2020-12-27 09:48:48 +00:00
QuoteFox
cb0d36aaf3 DNC is now worth no points.
DNC is now worth no points, having a DNC and used to give you 2 whole points, making it harder for medical seems abit outragous, If you want the roleplay or challange, you shouldnt be rewarded for wasting peoples time and then raging in dead chat about medical staff not knowing how to fix people.
2020-12-27 05:55:37 +00: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
Dip
232cb0cc48 Fix Objectives 2020-12-04 23:10:36 -03:00
Dahlular
ede0632fbf Merge pull request #726 from MalricB/euthanasia
Ports vampires. Or, bloodsuckers, rather.
2020-12-03 19:18:47 -07:00
CygnusB
db72f51d96 adds new sound for lunge, fixes mesmerize mute, weaks abilities 2020-12-02 21:30:57 -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
Dahlular
0d7d215167 Merge pull request #706 from ArchieBeepBoop/speech
Speech options on char customization
2020-12-01 20:13:32 -07:00
CygnusB
e9adea5d9f bsuckers get their objectives and also limits thrallling to 1 per 10 levels 2020-12-01 23:25:37 -03:00
CygnusB
ad8a067015 agonyyyy 2020-12-01 18:09:00 -03:00
Dahlular
9d006bedde Merge pull request #697 from Jay-Sparrow/Bug-fixin
Quick fix for the antag panel
2020-11-21 22:57:39 -07:00
Dip
88a5ecf523 Fix2 2020-11-22 02:21:16 -03:00
Dip
2a5c61dc45 fuck me 2020-11-22 01:29:01 -03:00
Dip
2dd9a7d544 Speech verbs 2020-11-21 05:03:33 -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
fe3d601c7c Merge pull request #685 from ArchieBeepBoop/nearsighted
Fixes Nearsighted overriding all glasses on spawn
2020-11-19 23:20:08 -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
JaySparrow
350ddab41b Quick fix for the antag panel
aaaaaaaa bugs
2020-11-19 15:39:02 -06: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
Dip
85ff244305 fix nearsighted overriding all glasses 2020-11-14 23:10:44 -03:00
Dahlular
28096ff19b Merge pull request #680 from ArchieBeepBoop/lunar
Lunar Items v0.1
2020-11-13 19:15:12 -07:00
Dahlular
a6da8a4373 Merge pull request #676 from ArchieBeepBoop/radiationresonance
[Proposal] Makes radiation resonance less undesirable.
2020-11-13 19:09:10 -07:00
Dip
78b97a1d51 lunar altar (temporary) 2020-11-13 19:29:03 -03: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
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
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
Dip
1006fb3c7e mood runtime 2020-10-28 16:57:47 -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
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
Dahlular
7aa0fccefa Merge pull request #608 from Kabramen/prosthetic-limb-quirk-revamp
Ports selectable prostethic limbs from Yog + quirk blacklist and two o…
2020-10-23 16:27:54 -06:00
Kabra_men
dc35022521 fix hypersensitive so it actually works now 2020-10-22 02:29:39 -03:00
Kabra_men
64ee851bdf Ports selectable prostethic limb from Yog + quirk blacklist and two other new quirks 2020-10-22 01:23:27 -03:00
Dip
9b7eee0a89 merge conflict 2020-10-18 16:54:22 -03:00
Dip
6163b7c963 GRUG SMASH RUNTIME 2020-10-18 04:34:21 -03:00
deathride58
cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
Dip
fa20d21b96 SHITCODE: BECOME MODULAR 2020-10-16 18:41:40 -03:00
Dip
29e1f9ba2f source 2020-10-13 18:34:25 -03:00
Dip
f0bf81cb1f Runtimes and balance 2020-10-13 06:10:12 -03:00
Dip
c0e6f28077 found the issue 2020-10-08 16:37:43 -03:00
Dahlular
2d3ed9da8a Merge pull request #563 from ArchieBeepBoop/actualpool
POOL
2020-10-07 19:37:44 -06:00