cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-10 07:37:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,334 Commits 12 Branches 0 Tags
d43bc54e458a8ea5482ec6b63828c660f617f495
Commit Graph

1452 Commits

Author SHA1 Message Date
DragonTrance
d43bc54e45 catnip gives felinids a mood boost 
TODO: after catnip icon gets merged
 2021-01-01 14:08:02 -07:00
QuoteFox
205879e74e Radio sounds on send 
Radio sounds on send
 2020-12-28 21:14:23 +00:00
Archie
d241229ba0 Merge remote-tracking branch 'upstream/master' into Surgery 2020-12-28 16:43:57 -03: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
a7ee147981 Merge pull request #780 from DragonTrance/drink-throwing 
another thing
 2020-12-28 19:33:42 +00:00
QuoteFox
4ea8b7bfcb Merge pull request #781 from TotallyNotADog/fixPrussian 
fixes prussian blue
 2020-12-28 19:33:23 +00:00
SandPoot
5684a36443 push files. 2020-12-28 15:49:19 -03:00
TotallyNotADog
06155664dd fixes prussian blue 2020-12-27 19:52:54 -06:00
DragonTrance
18fdedf6ab fixed sound not playing 2020-12-27 15:40:45 -07:00
QuoteFox
64b9c9f317 Merge pull request #778 from ArchieBeepBoop/cloning1 
Ports "Nerfs Cloning" by Silicons
 2020-12-27 19:22:12 +00:00
QuoteFox
4e87dc783b Merge pull request #779 from DragonTrance/drink-throwing 
Bartender's Drink Flinging fix
 2020-12-27 19:21:28 +00:00
DragonTrance
e57ba1502e tiny bit of cleanup 2020-12-27 12:19:54 -07:00
DragonTrance
76b0b45a0b drink flinging fix 
finally
 2020-12-27 12:12:41 -07:00
QuoteFox
8b9f6b1a1b Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2020-12-27 09:48:51 +00:00
QuoteFox
f73a8f7f24 Revert "DNC is now worth no points." 
This reverts commit cb0d36aaf3.
 2020-12-27 09:48:48 +00:00
Ghom
8b918b1d82 Merge pull request #10630 from Citadel-Station-13/kevinz000-patch-17 
Nerfs cloning
 2020-12-27 06:42:41 -03: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
Archie
188cc10974 Merge remote-tracking branch 'upstream/master' into Surgery 2020-12-27 04:29:21 -03:00
Ghom
482ba4a8ee Merge pull request #10806 from Feasel/master 
[Balance Patch - Tend Wounds Edition]
 2020-12-27 04:27:52 -03:00
kevinz000
c27dbcaf5f Merge pull request #9522 from Linzolle/tend-wounds 
Tend Wounds + Make Revival more accessible
 2020-12-27 04:27:29 -03:00
Archie
5710e12cb5 Surgery ports 1 2020-12-27 04:25:28 -03:00
QuoteFox
aa58dec5f4 Merge pull request #771 from ArchieBeepBoop/blood2 
Pooj Blood Code Cleanup
 2020-12-27 07:10:40 +00:00
QuoteFox
3a2d7212df Merge pull request #775 from ArchieBeepBoop/reagentfix2 
More Reagents fixed
 2020-12-27 07:10:09 +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
Archie
7c549e6b1e more reagents 2020-12-27 01:42:51 -03:00
QuoteFox
f390fbc8b5 Merge pull request #774 from quotefox/heat 
Heat and Detect Heat Lewd Traits
 2020-12-26 22:21:25 +00:00
QuoteFox
b3aecde046 Merge pull request #765 from DragonTrance/corpseflower 
Corpse Flower
 2020-12-26 21:50:41 +00: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
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
Archie
e23546c3a4 sleeper 2020-12-25 17:32:54 -03: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
QuoteFox
bcc26045aa Merge pull request #770 from ArchieBeepBoop/reagentfix1 
Reagent Fix Pack 1.1
 2020-12-25 19:49:00 +00:00
Archie
f9a7a97198 a 2020-12-25 11:25:43 -03: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
Archie
b2a1a63bb1 Reagent Fix Pack 1 2020-12-24 14:30:43 -03:00
Anthony Rodriguez
b48fa01953 Adds a *squeak emote 2020-12-23 21:08:01 -08:00
DragonTrance
a807a568a5 i feel like it shouldnt produce miasma while dead 2020-12-23 11:48:53 -07:00
DragonTrance
eaaa0c16a6 Corpse Flower 
aka brap farm
 2020-12-23 11:21:20 -07: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
QuoteFox
7ea68c2cb0 Merge pull request #753 from Oposshim/Donk.Co 
Donk.Corp-Port ✔️
 2020-12-23 17:34:12 +00:00
QuoteFox
2a1761e8ad Merge pull request #763 from ArchieBeepBoop/fixes-the-bugs 
Fixing some annoying bugs.
 2020-12-22 00:52:55 +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
Archie
41f0a84a87 Fire Extinguisher Reagents 2020-12-18 01:30:17 -03:00
Archie
48ede22c46 Merge remote-tracking branch 'upstream/master' into reagentsagain 2020-12-18 01:20:57 -03:00
QuoteFox
5723e57f90 Merge pull request #757 from ArchieBeepBoop/smite 
Tabletide Stationwide
 2020-12-16 13:14:18 +00:00
Dahlular
55267f2be5 Merge pull request #760 from MalricB/euthanasia 
Update ghost_role_spawners.dm
 2020-12-09 22:50:34 -07:00