cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,018 Commits 73 Branches 18 Tags
0884e805e0c96af1f23ac3f73698336815970096
Commit Graph

20270 Commits

Author SHA1 Message Date
Rob Nelson
9afa51ea80 Merge pull request #6064 from dylanstrategie/Gloves 
Re-sprite all glove in_hands
 2015-10-11 11:14:49 -07:00
Rob Nelson
b55ed70872 Merge pull request #6065 from dylanstrategie/Cable 
Fix Cable typo, formatting
 2015-10-11 11:14:30 -07:00
Rob Nelson
968f701c3c Merge pull request #6066 from dylanstrategie/Mine-Busy 
Add busy check to asteroid walls and boulders
 2015-10-11 11:13:57 -07:00
Rob Nelson
c00e07f84f Merge pull request #6067 from dylanstrategie/Banana-Slip 
Fix walking() proc to include locked_to
 2015-10-11 11:13:31 -07:00
Rob Nelson
203236ec54 Merge pull request #6069 from dylanstrategie/Ducky 
Fix rubber ducky description
 2015-10-11 11:12:39 -07:00
Rob Nelson
f157dc7f25 Merge pull request #6070 from dylanstrategie/Fluke-Ops 
Merge dexplosive and explosive implants
 2015-10-11 11:12:26 -07:00
PJB3005
7100b0f931 Fixes #6041 2015-10-11 20:05:07 +02:00
unid15
fa5f0ce336 corgi inhands, twohanding fix 2015-10-11 16:34:01 +02:00
dylanstrategie
bb63e465ae Merge dexplosive and explosive implants 2015-10-11 14:02:53 +02:00
dylanstrategie
179807e027 Fix rubber ducky description 2015-10-11 12:47:48 +02:00
DeityLink
4252e9f5d2 removing service borg dosh printer 2015-10-11 12:44:18 +02:00
DeityLink
7835ac11a5 Economy part 1 2015-10-11 12:32:39 +02:00
dylanstrategie
b8aef3e2fd Fix walking() proc to include locked_to 2015-10-11 11:20:08 +02:00
dylanstrategie
d672dea00c Add busy check to asteroid walls and boulders 2015-10-11 11:09:13 +02:00
dylanstrategie
9b3499a22c Fix Cable typo, formatting 2015-10-11 10:25:27 +02:00
dylanstrategie
92713c00cf Re-sprite all glove in_hands 2015-10-11 09:17:04 +02:00
dylanstrategie
7d7cc25ecf Tacticool Turtlenecks now have suit sensors, which are off by default 2015-10-11 07:01:49 +02:00
dylanstrategie
7713bb82b2 Remove redundant check 2015-10-11 06:44:32 +02:00
dylanstrategie
126024e0de Use ChangeTurf for Mining Surprises 2015-10-11 06:42:14 +02:00
dylanstrategie
360d2f577b Rework Showers 2015-10-11 06:00:43 +02:00
dylanstrategie
14b613bd53 New in-hand sprites for the Battering Ram 2015-10-11 04:28:23 +02:00
Rob Nelson
19a2761032 Disable debug. 2015-10-10 15:05:34 -07:00
Rob Nelson
729c728184 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into tcomms-rework 
# Conflicts:
#	code/setup.dm
 2015-10-10 15:03:34 -07:00
Rob Nelson
9a51d58ded Whisper fixed. 2015-10-10 15:00:23 -07:00
PJB3005
514767e4f1 Makes proximity sensors 50% less spooky. 
Fixes #6051
 2015-10-10 23:50:18 +02:00
D3athrow
19569f8351 forgot this 2015-10-10 12:38:19 -05:00
D3athrow
69dfd13937 OOC ban - It compiles! 2015-10-10 12:36:47 -05:00
Rob Nelson
eb477e4bcf Merge pull request #6039 from unid15/trade_destinations 
Fixes cables on shuttles
 2015-10-09 20:17:00 -07:00
Rob Nelson
91ff3f98e1 Merge pull request #6046 from Arthurdentist/chapelvend 
Chaplain Vendors 2
 2015-10-09 20:16:20 -07:00
clusterfack
8f237fe448 Merge pull request #6032 from DeityLink/handtele 
HAHA YOU ACTUALLY READ THIS WHAT A FAGGOT
 2015-10-09 16:55:05 -05:00
Arthurdentist
7721905ca2 Chaplain Vendors 2 2015-10-09 22:51:33 +01:00
DeityLink
62a3782eeb handtele compromise 2015-10-09 23:29:39 +02:00
Rob Nelson
3c7809393b Clean up pooling. 2015-10-09 13:00:08 -07:00
Rob Nelson
74c8832845 Fix compile 2015-10-09 12:06:18 -07:00
Rob Nelson
ec3c43fd37 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into tcomms-rework 
# Conflicts:
#	code/modules/mob/living/carbon/species.dm
#	vgstation13.dme
 2015-10-09 11:15:14 -07:00
Rob Nelson
66b029e290 Debugging. 2015-10-09 11:11:37 -07:00
DeityLink
229cf73839 FUCK 2015-10-09 20:08:01 +02:00
DeityLink
f45d150f41 fixing issues whatever 2015-10-09 20:05:23 +02:00
DeityLink
d556c3724d fixing issues 4 2015-10-09 19:48:55 +02:00
Rob Nelson
e43e0f3b58 Well, now I'm at a point where I'm getting memory corruption. 2015-10-09 10:25:26 -07:00
DeityLink
a97d369eb5 fixing issues 3 2015-10-09 19:19:32 +02:00
unid15
111f5c55b8 proper rotation for cables! 2015-10-09 17:57:56 +02:00
ririchiyo
1eb79eb968 Merge pull request #6036 from DeityLink/fix-sunflowers-mutations 
[Bugfix] Fixed sunflowers and soybeans not mutating.
 2015-10-09 11:37:47 -04:00
DeityLink
04b44d5ed0 fixing sunflower and soybean mutation 2015-10-09 17:22:16 +02:00
DeityLink
0ff9386b3e fixing issues 2 2015-10-09 17:14:21 +02:00
DeityLink
37398b31c5 fixing issues 1 2015-10-09 08:54:35 +02:00
D3athrow
a3b460ccca migrations for nexis 2015-10-08 22:26:21 -05:00
Rob Nelson
7ac457b921 Cool, everything's working now, just need to fix radios. 2015-10-08 18:12:30 -07:00
Rob Nelson
93db7847be asking for help oh god why 2015-10-08 17:08:11 -07:00
DeityLink
cda3e8f94d the Portals update 2015-10-09 01:00:13 +02:00