Commit Graph

335 Commits

Author SHA1 Message Date
Archie
76ebc0f494 New sprite! 2021-01-16 01:11:46 -03:00
Archie
42c738879a comment 2021-01-16 01:04:42 -03:00
Archie
5680049195 nerf the rat ™️ 2021-01-16 00:58:43 -03:00
QuoteFox
0d23ec3ee7 Merge pull request #881 from ArchieBeepBoop/ratswearetherats
SS13 - The Rat Update (Store mice in Chef hats + Regal Rats)
2021-01-16 03:48:26 +00:00
QuoteFox
992e168cd6 hairfre
hairfre
2021-01-16 02:24:58 +00:00
Timothy Teakettle
5cca6129a5 Regal Rats + Mice in hat 2021-01-15 21:18:12 -03:00
Archie
b3eecd427d Makes boommouses not eat wires 2021-01-15 16:11:20 -03:00
QuoteFox
4128a9fe78 fixes AI radio
fixes AI radio
2021-01-15 00:28:47 +00:00
Archie
4ce4e88398 Fixes some shit 2021-01-14 14:59:03 -03:00
Archie
3d46b689ac Fix EOL issues 2021-01-14 14:54:39 -03:00
kevinz000
b5fe141a49 Supply Pod Code Update 2021-01-14 14:31:35 -03:00
QuoteFox
b741e9a3cd Merge pull request #872 from ArchieBeepBoop/hidekey
Hide Ckey on Roundend Pref
2021-01-14 00:57:16 +00:00
Archie
c7d78a3d40 Hide key v1 2021-01-13 16:22:56 -03:00
Archie
7d19680fc3 remove log, typo 2021-01-12 22:57:53 -03:00
Archie
ebee3bae26 The boom mouse beckons 2021-01-12 22:56:17 -03:00
DeltaFire
2b79e974eb Merge pull request #13909 from silicons/twitch_plays
Twitch Plays: Clown Car
2021-01-10 14:03:51 -03:00
QuoteFox
c60a23ec15 Bug fix subtle
Subtle would spit out a number instead of your actual text, this is fixed.
2021-01-09 15:03:34 +00: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
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