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

350 Commits

Author SHA1 Message Date
CapnMachaddish
157c3722ac no longer shitcode 2021-01-12 00:59:24 -06:00
Archie
80d37a88ae Fixes ghost role text all around 2021-01-10 12:13:31 -03:00
QuoteFox
a875b9ffa7 condoms now fit in wallets. 
condoms now fit in wallets.
 2021-01-09 16:33:44 +00:00
Archie
65c316b35d ID + Hex Color Sanity Fixes 2021-01-08 19:45:07 -03:00
Archie
c164b52b30 Merge remote-tracking branch 'upstream/master' into nexties2 2021-01-08 15:20:47 -03:00
QuoteFox
f1fbb326f9 Merge pull request #839 from Chemlight/I-Want-Easier-Less-Than-Lethal-Traitor 
Syndicate Less Than Lethal option
 2021-01-08 18:04:45 +00:00
Chemlight
b329c46061 Syndicate Lesss Then Lethal option 
Thought I'd provide a better way on how to approach doing a maroon objective or rather theft antag related stuff. lately I've been seeing a lot of traitors go with the more lethal option for insurance.
 2021-01-08 05:52:01 -08: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
kevinz000
6bb4498919 Merge pull request #9658 from Ghommie/Ghommie-cit291 
Fixing dogborg sleepers runtimes, how atrocious...
 2021-01-07 15:22:39 -03:00
QuoteFox
cd4fe44bbf Merge pull request #789 from Tename/boggers 
Borg equipment changes
 2021-01-07 00:17:31 +00:00
Lin
02da471330 Merge pull request #10238 from Ghommie/Ghommie-cit478 
Brings in some mapping code updates.
 2021-01-06 15:39:13 -03:00
Ghom
ca735a752e Merge pull request #10505 from LetterN/beep-boom 
better electropack ui
 2021-01-06 14:57:15 -03:00
kevinz000
625b35b8cb Merge pull request #9755 from Ghommie/Ghommie-cit331 
lentext to length, yet another 513 requirement.
 2021-01-05 17:39:10 -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
Archie
10e74b643e Fix scanners.dm conflict 2021-01-05 03:31:28 -03:00
QuoteFox
bb83dfc24f Merge pull request #823 from ArchieBeepBoop/morereagentfixesyeeeet 
More reagent bullshit fixes YEEEEET
 2021-01-05 06:21:13 +00: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
dc7c1aca91 Merge pull request #10538 from Putnam3145/chemistry-aaa 
Fixes to chemistry
 2021-01-04 21:26:29 -03:00
Archie
0fba3d15e1 scannerfix 2021-01-04 21:22:21 -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
kevinz000
7f2de64be7 RCD Update Sync 2021-01-04 18:13:02 -03:00
kevinz000
2c11b68f2f Fixes chemscan 2021-01-03 05:56:28 -03:00
QuoteFox
bf1e84193a Merge pull request #807 from DragonTrance/deconstructing 
loom slapping fix
 2021-01-03 05:42:17 +00:00
DragonTrance
e83cf212c1 loom slapping fix 2021-01-02 13:11:04 -07: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
1822adc29e Merge pull request #800 from DragonTrance/meow-mix 
Meow Mix
 2021-01-02 13:40:47 +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
f27bafe721 barsign meow mix fix 2021-01-01 12:30:40 -07:00
Archie
cab493231b Reagent fix pack 3 2021-01-01 02:21:45 -03: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
1f4c328d0d Merge pull request #795 from DragonTrance/granters-indication 
Gives book granters an indication to how far until you master the subject
 2021-01-01 02:24:30 +00:00
DragonTrance
e452c22972 book granters indicate progress 2020-12-31 13:44:47 -07:00
Chloe Carver-Brown
c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +00:00
Tename
a30508ed3f burgers 2020-12-29 22:29:20 -08: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
9c2c2a22e2 Merge pull request #773 from DragonTrance/deconstructing 
Adds the Ability to deconstruct various objects
 2020-12-28 19:34:37 +00:00
QuoteFox
d940287569 Merge pull request #777 from ArchieBeepBoop/drakeborg 
Removes Drakeborgs
 2020-12-27 08:59:00 +00:00
silicons
16cc9e35f7 Removes Drakeborgs 2020-12-27 05:55:38 -03:00
DragonTrance
9068e9c580 Update loom.dm 2020-12-25 14:14:52 -07:00
DragonTrance
57117b0017 why does my compiler do this i hate it 2020-12-25 13:39:51 -07:00
Ghom
0c8ed89992 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1 
Cleanup/Partial revert of RGB blood ""rework""
 2020-12-25 17:30:06 -03:00
DragonTrance
162ae674c6 constructible showers, loom, sinks & barrels now deconstruct 
Deconstruction:
Loom - Screwdriver
Wooden Barrel - Screwdriver
Sink - Wrench
Shower - Screwdriver > Wrench

Securing:
Loom - Wrench
Wooden Barrel - Wrench
Shower - Screwdriver

Adds showers as craftable objects when using metal sheets. Also organizes some things in the metal sheet crafting menu
 2020-12-25 13:22:21 -07:00