cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-03-23 11:42:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,573 Commits 12 Branches 0 Tags
91c103e0aaa2b20dd0a595daaaa7adaa011ebf0d
Commit Graph

286 Commits

Author SHA1 Message Date
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
QuoteFox
cd4fe44bbf Merge pull request #789 from Tename/boggers 
Borg equipment changes
 2021-01-07 00:17:31 +00:00
kevinz000
19d6a19b4a Merge pull request #9548 from Ghommie/Ghommie-cit251 
Fixing radio emotes conflict with drunk memes.
 2021-01-05 17:25:53 -03:00
Lin
6ef6d21a84 Merge pull request #9722 from Ghommie/Ghommie-cit320 
Umodularize saycode and meat slabs.
 2021-01-05 17:23:36 -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
4d164c0b5b Merge pull request #813 from ArchieBeepBoop/thalpyyyyy 
Updates our Fermichems, fixes synthtissue.
 2021-01-04 05:41:29 +00:00
QuoteFox
68c6277ee8 Remove radio in 
say.dm is fucked and makes no sense.
 2021-01-04 04:35:28 +00:00
kevinz000
12c8ebea11 Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite. 2021-01-03 05:21:47 -03:00
kevinz000
ee082f200e Fermi1 2021-01-03 05:00:57 -03:00
kevinz000
b21c65055a Surgery fix package 2021-01-02 19:03:45 -03: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
a9575ffc21 Merge pull request #794 from lyricalpaws/master 
Let synthliz and IPC have and be infected by nanites
 2021-01-02 14:02:24 +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
QuoteFox
aa2280113d Merge pull request #785 from DragonTrance/this-is-my-3rd-branch-i-hate-github-sometimes 
Expander + VTEC upgrades Fix (times two)
 2021-01-01 02:26:01 +00:00
QuoteFox
8f374d0213 Fix fix heat 
Fix fix heat
 2020-12-31 23:32:48 +00:00
Chloe Carver-Brown
ec82ae4d80 Merge branch 'master' of github.com:lyricalpaws/Hyper-Station-13 2020-12-31 17:59:03 +00:00
Chloe Carver-Brown
c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +00:00
Chloe
2c21633a8c Merge pull request #4 from quotefox/master 
Update
 2020-12-31 17:01:52 +00:00
Chloe Carver-Brown
c3ad6b5500 Making silicons their own biotype 2020-12-31 16:45:11 +00:00
QuoteFox
bab90efbb1 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2020-12-31 09:28:28 +00:00
QuoteFox
0fbedcfec4 temp fix to heat 
temp fix to heat
 2020-12-31 07:19:42 +00:00
Tename
769721300f boggers 2020-12-29 22:12:38 -08:00
kevinz000
10069637a5 Merge pull request #9441 from lolman360/whydowehave1000branches 
Ports /tg/ advanced surgerytools and tool defines.
 2020-12-30 00:42:50 -03:00
DragonTrance
529824b320 borg expander + vtec upgrades fix 2020-12-29 11:15:19 -07:00
QuoteFox
205879e74e Radio sounds on send 
Radio sounds on send
 2020-12-28 21:14:23 +00:00
Archie
5710e12cb5 Surgery ports 1 2020-12-27 04:25:28 -03:00
QuoteFox
3588d4044c Heat Traits 
For fun and for anyone wanting to do their heat/breeding fetish. Opt-in required.
 2020-12-26 20:57:09 +00:00
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