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
25,956 Commits 73 Branches 18 Tags
3e55035c132d334bec368bef202a0e78d44a6e70
Commit Graph

19521 Commits

Author SHA1 Message Date
DeityLink
3e55035c13 hooklogs and fix 2015-08-25 23:59:06 +02:00
Clusterfack
ab5c99df39 Merge branch 'debugcult' into 'Bleeding-Edge' 
[Hotfix] Check Convertable showing wrong ckey

See merge request !123
 2015-08-25 11:32:14 +00:00
Clusterfack
01baebf8c4 Merge branch 'funkymonkey' into 'Bleeding-Edge' 
Gets rid of duplicate biogenerator.dm, actually adds monkey cubes as a product of the biogen

Actually allows you to get monkey cubes from the biogenerator now. This is already in the changelog, but didn't work because I was testing the wrong biogenerator.

The deleted file isn't ticked, so no dme edit required.

See merge request !127
 2015-08-25 11:19:01 +00:00
Clusterfack
e0ea7002c9 Merge branch 'fuxes' into 'Bleeding-Edge' 
Bugfixes

* Fixes corgi meat objective not working (Fixes #110)

* Fixes corgi meat recipes not working

* Fixes gibber runtimes (Fixes #104, Fixes #88)

* Fixes mobs not rotating properly on shuttles

See merge request !132
 2015-08-25 11:14:14 +00:00
Clusterfack
781d0a330b Merge branch 'charts' into 'Bleeding-Edge' 
A nice chart for the power monitor & colour coding.

![](http://i.imgur.com/9wCGRXR.png)

[WebM, yes this updates realtime.](https://dl.dropboxusercontent.com/u/107028026/ShareX/2015/08/2015-08-22_00-55-48.webm)

The chart is powered by [Chart.js](http://www.chartjs.org/), which is licensed under MIT.

Yes, the wattages are formatted automatically, individually.

See merge request !133
 2015-08-25 10:56:35 +00:00
D3athrow
27ba44632c return sleep to stat 2015-08-25 05:24:27 -05:00
clusterfack
d5959cf941 Save AIs from experimental guns 2015-08-25 04:51:43 -05:00
Clusterfack
f2e999c4ef Merge branch 'buttdentity' into 'Bleeding-Edge' 
butts now use real_name instead of name for providing names of owner

Also absolute pathing.

See merge request !138
 2015-08-25 09:30:41 +00:00
Clusterfack
639abe3c73 Merge branch 'fixjaunters' into 'Bleeding-Edge' 
Fixes a jaunter runtime. Jaunters now work correctly.

sleep in New() was halting the proc, so it would delete the portal and then try setting its target

See merge request !136
 2015-08-25 08:40:44 +00:00
Rob Nelson
114405c646 Merge branch 'Bleeding-Edge' of gitlab.com:vgstation/vgstation into Bleeding-Edge 2015-08-24 23:14:54 -07:00
Rob Nelson
4050bc7939 Fix d3athrow fucking up migrations, add proper SQLite support. 2015-08-24 23:14:11 -07:00
ririchiyo
e6aebe6fd6 Merge branch 'experimentalweaponsupdate' into Bleeding-Edge 2015-08-24 20:18:46 -04:00
DeityLink
65558e780c Finishing Touches (the Experimental Guns update) 2015-08-25 00:36:46 +02:00
DeityLink
b613f719e0 comments 2015-08-24 15:59:15 +02:00
DeityLink
aeef243da4 gun secret panel 2015-08-24 15:42:52 +02:00
DeityLink
0d550338d4 putting some order in my guns 2015-08-24 14:58:47 +02:00
D3athrow
562c477fe1 fix being able to cast spells while being under the influcence of zombie powder. 2015-08-24 00:54:15 -05:00
Intigracy
00d8b8d7f0 butts now use real_name instead of name when providing its owner's name 2015-08-23 18:17:18 -07:00
D3athrow
1968448a95 something something paralysis 2015-08-23 19:28:19 -05:00
D3athrow
218b9df66e what the fuck was this supposed to do? 2015-08-23 19:28:05 -05:00
D3athrow
66c9896de9 fucking shit code dont edit it directly 2015-08-23 19:27:57 -05:00
DeityLink
58bf419dbd polishing post-rebase 2015-08-24 01:03:50 +02:00
DeityLink
34a6333d2c Experimental Guns No10. Hookshot 2015-08-24 00:46:18 +02:00
DeityLink
63e69c2b14 Experimental Guns No9. Gravity Well Gun 2015-08-24 00:45:26 +02:00
DeityLink
72b4d98461 penetration 2015-08-24 00:45:25 +02:00
DeityLink
dc22d6cf7f Experimental Guns No8. PGM Hecate II 2015-08-24 00:43:06 +02:00
DeityLink
72217708ee icons 2015-08-24 00:38:29 +02:00
DeityLink
182ef129d0 polishing 2015-08-24 00:38:28 +02:00
DeityLink
92a84648e4 appearance ftw 2015-08-24 00:38:26 +02:00
DeityLink
bcfeefd232 remove initial 2015-08-24 00:37:29 +02:00
DeityLink
79762052a3 fixing Righteous Bison projectile 2015-08-24 00:37:28 +02:00
DeityLink
d928ca2f04 gdammit 2015-08-24 00:37:27 +02:00
DeityLink
d6a8f461b4 lookin good 2015-08-24 00:37:26 +02:00
DeityLink
087f2ab47b polishing 2015-08-24 00:34:24 +02:00
DeityLink
411caf90cb Experimental Guns No7. OSIPR 2015-08-24 00:34:22 +02:00
DeityLink
65df0a2388 destroy 2015-08-24 00:28:49 +02:00
DeityLink
dcc133cf60 bounce 2015-08-24 00:28:48 +02:00
DeityLink
45fb48694c Turrets and Mecha projectiles fixes 2015-08-24 00:28:01 +02:00
DeityLink
139df740e2 fixing turrets and mecha projectiles 2015-08-24 00:28:00 +02:00
DeityLink
962568a2c2 Experimental Guns No5. Nikita 2015-08-24 00:27:57 +02:00
DeityLink
e1ab433363 sfgdrfgh 2015-08-24 00:18:07 +02:00
DeityLink
be2a669cb6 that should do it, or whatever 2015-08-24 00:18:06 +02:00
DeityLink
61ddaf8142 fix 2015-08-24 00:18:05 +02:00
DeityLink
c469d5502b sample text 2015-08-24 00:18:04 +02:00
DeityLink
55c97473d6 turf_flick_anim 2015-08-24 00:18:03 +02:00
DeityLink
922ae40f4f Experimental Guns No5. Stickybomb Launcher 2015-08-24 00:17:09 +02:00
DeityLink
e44c8adf78 fire sounds 2015-08-24 00:06:17 +02:00
DeityLink
0142302d85 fprint 2015-08-24 00:06:16 +02:00
DeityLink
1b4b478e13 Experimental Guns No4. Gatling Gun 2015-08-24 00:06:15 +02:00
d3athrow
10729ecead Merge pull request #5444 from DeityLink/gunnss 
Impacts hotfix
 2015-08-24 00:05:13 +02:00