Commit Graph

236 Commits

Author SHA1 Message Date
DragonTrance
3ebb7488de Merge branch 'master' into plant-adding 2021-02-21 12:06:48 -07:00
QuoteFox
f698f16e27 Thirst System
Thirst System
2021-02-13 14:44:55 +00:00
DragonTrance
58b69503e3 #4 2021-02-11 20:02:40 -07:00
Chemlight
2a2979f33b Don't touch me! (neutral trait)
Adds a new neutral trait called distant, kind of like apathetic but focused soly on headpats.
2021-02-08 06:27:48 -08:00
Chloe
29c3c79aed Update good.dm 2021-02-06 18:19:58 +00:00
Chloe Carver-Brown
7d5e2d889b Extremely small fix 2021-02-06 01:24:47 +00:00
Chloe Carver-Brown
bc315a750c Finally bring languages 2021-02-05 03:22:57 +00:00
silicons
e1ad9f8957 i have done nothing but teleport bread for three days 2021-01-19 13:48:33 -03:00
Archie
4ee3ea16e0 Fixes Pandemic UI Crash 2021-01-16 22:47:29 -03:00
QuoteFox
4fa44a4e94 Nerf/Buff to social anxiety, removes silence.
for one point, the fact you cannot speak at all.. for 10 whole seconds is to much for 1 point.
2021-01-16 05:34:42 +00:00
Timothy Teakettle
5cca6129a5 Regal Rats + Mice in hat 2021-01-15 21:18:12 -03:00
kevinz000
b5fe141a49 Supply Pod Code Update 2021-01-14 14:31:35 -03:00
Archie
c7d78a3d40 Hide key v1 2021-01-13 16:22:56 -03:00
TotallyNotADog
4bee682e2c rad sprots 2021-01-10 18:03:10 -06:00
DeltaFire
2b79e974eb Merge pull request #13909 from silicons/twitch_plays
Twitch Plays: Clown Car
2021-01-10 14:03:51 -03:00
Ghom
bfe9fa745c Merge pull request #11044 from Arturlang/TGUI_Next_Uplink
TGUI Next Uplinks
2021-01-09 15:35:32 -03:00
Archie
c164b52b30 Merge remote-tracking branch 'upstream/master' into nexties2 2021-01-08 15:20:47 -03:00
Archie
78da9a5a12 Merge branch, update to current 2021-01-08 07:26:35 -03:00
kevinz000
939d8258de Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2021-01-08 07:11:56 -03:00
Archie
f2d51707fb tones down things that could nuke the codebase 2021-01-06 22:56:41 -03:00
Archie
2899fabbc9 move mutations again 2021-01-05 17:46:02 -03:00
Archie
11515b3b32 move mutations 2021-01-05 17:28:04 -03:00
BlackMajor
02cb328921 Merge pull request #9747 from Ghommie/Ghommie-cit329
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
2021-01-05 16:58:19 -03:00
kevinz000
5d80346f8f Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
2021-01-05 16:54:23 -03:00
Putnam3145
0db5aed986 Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2021-01-05 16:51:22 -03:00
BlackMajor
4b8b03fea0 Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled. 2021-01-05 16:32:02 -03:00
Archie
9e37d3be62 Fix merge conflicts 2021-01-05 03:41:08 -03:00
Lin
b0779fe2d7 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00
Ghom
291dcf9515 Merge pull request #10575 from Arturlang/TGUIs_Nexties
[TESTMERGE] Properly working TGUI Next
2021-01-04 19:47:54 -03:00
QuoteFox
ff20e5077b Merge pull request #808 from DragonTrance/catnip-mood-boost
Gives Catnip a Mood Boost to felinids
2021-01-03 05:41:24 +00:00
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
DragonTrance
b51b969ee2 slower metabolism 2021-01-01 14:16:15 -07:00
DragonTrance
d43bc54e45 catnip gives felinids a mood boost
TODO: after catnip icon gets merged
2021-01-01 14:08:02 -07: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