cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-03-27 13:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
250 Commits 12 Branches 0 Tags
3ba1b7b83f202ec648f0800a197a100b40fa5cee
Commit Graph

250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Suicidalpickles
3ba1b7b83f plasmeme update 2019-11-12 17:03:19 -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
95d7876b1f Merge pull request #3 from Azarak/pr/1 
I dont know where this conflict appeared out of but im fixing it?
 2019-11-08 21:22:29 +01:00
Azarak
103869977b I dont know where this conflict appeared out of but im fixing it? 2019-11-08 21:17:17 +01:00
Azarak
2304c0cf71 Merge pull request #2 from Azarak/pr/1 
aaaaaaa
 2019-11-08 21:17:12 +01:00
Azarak
80db742296 Merge branch 'master' into pr/1 2019-11-08 21:11:46 +01:00
Azarak
d7a3df9e6d Perhaps this will work 2019-11-08 20:53:55 +01:00
Azarak
079b44719c fixes conflict hopefully 
title
 2019-11-08 20:35:12 +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
quotefox
8dd0d0e13c Merge pull request #58 from Kabramen/Cross 
The cross
 2019-11-08 19:24:18 +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
b796fb6bcc human hotfix and graphics fix 2019-10-30 10:54:42 +00:00
quotefox
547024b39c fix again 2019-10-29 08:12:13 +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
354e3280a5 command door fix 2019-10-29 03:19:54 +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
e8348196b7 sprite fix 2019-10-25 23:34:00 -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
96c6104047 security double doors 2019-10-25 21:15:10 +01:00
quotefox
7411e614ca fix to interface 2019-10-25 19:25:54 +01:00
quotefox
d59c378d7b fix 2019-10-25 19:23:10 +01:00
quotefox
ea3c4f487a Dahlular's skulldog muzzle 2019-10-25 19:16:38 +01:00
quotefox
cd79c7c797 door map fix 2019-10-25 19:15:54 +01:00
quotefox
b7f72a1cc1 door graphics 2019-10-25 19:15:05 +01:00
quotefox
a8f5f33e36 Merge pull request #44 from Jizzard/Xeno-butt 
Update alienqueen.dmi
 2019-10-25 17:10:30 +01: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