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
250 Commits 12 Branches 0 Tags
71e330143961065d7eb02d03b60a1b3cd2c7d8bc
Commit Graph

152 Commits

Author SHA1 Message Date
Suicidalpickles
71e3301439 aaaa 2019-11-11 15:20:00 -08:00
quotefox
739240592e - Fix to github 2019-11-08 21:50:59 +00:00
quotefox
23d7ac11af Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 
# Conflicts:
#	icons/obj/device.dmi
 2019-11-08 20:55:57 +00:00
quotefox
19810f7e98 Merge pull request #59 from Azarak/master 
It's me trying to fix a conflict and I've never done this don't mind me
 2019-11-08 20:48:47 +00:00
quotefox
ace551ba39 bone stuff 2019-11-08 20:48:18 +00:00
Azarak
80db742296 Merge branch 'master' into pr/1 2019-11-08 21:11:46 +01:00
quotefox
1699ed1d94 Merge pull request #54 from SynnGraffkin/Construction-Bags 
[PORT] Adds construction bags for engineers
 2019-11-08 19:34:39 +00:00
quotefox
db364363eb Merge pull request #57 from shellspeed1/bluespace-hotel 
Ports Hilberts hotel (bluespace hotel)
 2019-11-08 19:32:42 +00:00
Kabra_men
a3c09948fa Cross 2019-11-07 18:06:34 -02:00
shellspeed1
0ab8a91ea9 Adds bluespace hotel 2019-11-06 18:15:11 -08:00
Azarak
1544eafb4f TG GENETICS AAAAAAAA 
aaaaaaaa
 2019-11-04 23:20:16 +01:00
quotefox
0ff71208ae Merge pull request #53 from shellspeed1/fixes-sock-colors 
fixes sock colors.
 2019-11-04 08:20:53 +00:00
quotefox
a4f291a032 Merge pull request #52 from shellspeed1/makes-slime-hungry 
makes slime hungry
 2019-11-04 08:20:30 +00:00
Toast
caa2d91eb4 Fixes 2019-11-04 03:09:52 -05:00
Toast
790881594d Bag-added 2019-11-04 02:34:49 -05:00
shellspeed1
ff6fabb7fa fix 2019-11-03 13:12:02 -08:00
shellspeed1
b9f23a4070 makes slime hungry 2019-11-02 13:28:28 -07:00
quotefox
d2554b3ca9 Fix for bot, patrol was broken. (removed the code by accident) 2019-11-02 06:23:58 +00:00
quotefox
d775e4eef3 update 2019-11-01 08:24:56 +00:00
quotefox
7879f49cff fixes 2019-10-29 06:35:56 +00:00
quotefox
c6943658dd Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2019-10-29 04:02:33 +00:00
quotefox
1838075d99 Merge pull request #48 from shellspeed1/mech-capacitor-and-scanner-update 
Ports some code improvements and gives odyessy, ripley, and firefighter scanners and capacitors.
 2019-10-29 03:23:41 +00:00
quotefox
8ac316392d Merge pull request #49 from shellspeed1/removes-bags-from-toolbelts 
removes storage bags from toolbelts
 2019-10-29 03:22:35 +00:00
quotefox
8144df3a15 Merge pull request #50 from shellspeed1/stasis-bed-improvements 
Borgs can now unbuckle people from stasis beds, Surgery is now performable on stasis beds.
 2019-10-29 03:22:09 +00:00
quotefox
e3914bac91 update 2019-10-29 03:12:53 +00:00
shellspeed1
e7522ce64c can now operate on stasis beds 2019-10-26 12:46:46 -07:00
shellspeed1
d2da9e571e borgs should be able to unbuckle people now. 2019-10-26 12:44:54 -07:00
shellspeed1
aa9fafcab9 removes storage bags from toolbelts 2019-10-26 12:01:03 -07:00
shellspeed1
a6ff0cb5de Code Improvements for mech made by Nemvar at tg 2019-10-26 00:49:25 -07:00
shellspeed1
f122fc73f0 indent fix 2019-10-25 23:33:50 -07:00
shellspeed1
3ebb3464b6 makes it so ripley, firefighter, ody, and honk take capaictors and scanners to build 2019-10-25 22:53:49 -07:00
quotefox
45cb9072cd Merge pull request #41 from shellspeed1/organ-healing-fixes 
Fixes Issue with Tounge, Stomach, and heart not passively healing.
 2019-10-25 17:09:06 +01:00
quotefox
bbfb448536 Merge pull request #43 from shellspeed1/tricord-balance 
makes od deal 1/4th of damage
 2019-10-25 17:08:27 +01:00
quotefox
af29c87583 Merge pull request #45 from shellspeed1/botany-belt-redo 
Adds a botany toolbelt craftable with 4 leather.
 2019-10-25 17:07:43 +01:00
quotefox
1b53c2a920 impregnation settings in preferences 2019-10-25 17:05:01 +01:00
quotefox
ab375c58d0 impregnation update 2019-10-25 17:03:19 +01:00
shellspeed1
32283dd1f8 recreates belt. 2019-10-24 15:24:49 -07:00
shellspeed1
48f06aa113 makes od deal 1/4th of damage 2019-10-23 11:16:07 -07:00
shellspeed1
29414a14ed aaaaaa 2019-10-23 01:32:03 -07:00
quotefox
f9a2621b0d Merge pull request #38 from shellspeed1/heart-bypass-fix 
Fixes to surgeries to make them work.
 2019-10-21 00:07:24 +01:00
shellspeed1
ac75adb229 fixes to embalming 2019-10-20 16:00:25 -07:00
shellspeed1
ecd768fdc4 more surgery fixes 2019-10-20 15:34:02 -07:00
shellspeed1
388db87515 fixes sprites again 2019-10-19 13:54:30 -07:00
shellspeed1
8c8b95efb4 sprites and similar fixes 2019-10-19 13:04:54 -07:00
shellspeed1
5d1ed71dc2 Code work to port carpets from citadel 2019-10-19 12:02:31 -07:00
shellspeed1
c830acdf1e And this is how I lost my medical license 2019-10-19 11:11:14 -07:00
quotefox
b9a598bbd9 Merge pull request #36 from shellspeed1/Organ-updates-for-stasis-beds 
Massive organ overhaul and some new surgeries ported from cit orginally created by Fermi. Mergeable
 2019-10-18 21:47:14 +01:00
quotefox
495c9753b3 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2019-10-18 21:39:37 +01:00
shellspeed1
0e0f5e642f Ooof 2019-10-18 13:24:24 -07:00
quotefox
1d26cba3b8 FPS menu option 2019-10-18 19:59:05 +01:00