Commit Graph

10984 Commits

Author SHA1 Message Date
Rob Nelson
469c7a8db7 Get rid of last traces of Skills shit, I think. 2015-08-26 22:27:50 -07:00
D3athrow
59cec39b90 runtime sanity 2015-08-26 17:06:09 -05:00
clusterfack
d2537620f0 Fix compile as well as behavior 2015-08-26 12:36:36 -05:00
Rob Nelson
06bac49211 And yeah, don't use usr. 2015-08-26 10:33:25 -07:00
Rob Nelson
992eb8d2f1 Missed a couple lines. 2015-08-26 10:32:18 -07:00
Rob Nelson
944b54b675 Fix compile 2015-08-26 10:28:07 -07:00
Rob Nelson
fdc0485aa9 Merge branch 'Bleeding-Edge' into 'Bleeding-Edge'
work around for boomboxes being in a box fixes #97

any machines (including boomboxes) that are purchased now no longer come in a box.

See merge request !141
2015-08-26 17:19:20 +00:00
Crnibombarder
c618065352 im going to play doom 2 for 2 months straight and then shoot up my school 2015-08-26 17:15:43 +00:00
Rob Nelson
bd88504b1f Merge branch 'never_enough_fish' into 'Bleeding-Edge'
Adds space carp pheromones

Eh, probably shitty but here it goes. Probably needs a better name too

* Created by mixing carpotoxin, leporazine and carbon. You have to have them in your system for them to have any effect

* Carps won't mind you if you have carp pheromones in your system. If a carp is already angry at you, however, ingesting pheromones won't save your ass

* If you have carp pheromones in your system, you constantly emit a horrible stench noticeable by other people without a mask on.

Also removes an unused type of meat which doesn't work

See merge request !118
2015-08-26 07:32:54 +00:00
Rob Nelson
e885cd4833 Merge branch 'beekeeper' into 'Bleeding-Edge'
Beekeeper job title

* Added "Beekeeper" to botanist alt job titles.

See merge request !130
2015-08-26 07:23:37 +00:00
Rob Nelson
d9887d0757 Merge branch 'ghostlymothafucka' into 'Bleeding-Edge'
fix #93 (ghost preferences are no longer ass backwards)

fix #93

See merge request !139
2015-08-26 07:22:35 +00:00
DeityLink
6a50fc007b beekeeper jumpsuit 2015-08-26 05:15:43 +02:00
DeityLink
f09e4bb98e hookfix 2015-08-26 04:02:24 +02:00
DeityLink
012560a717 fixin 2015-08-26 02:47:43 +02:00
DeityLink
383a99d4de gravitypull fix 2015-08-26 02:26:06 +02:00
Clusterfack
f32dfb5102 Merge branch 'bugfix' into 'Bleeding-Edge'
Fixing a hookshot bug, and adding attack logs

* Fixed a bug that would make hookshots unable to fire, and their projectile chain to remain on the ground.
* Using the hookshot on a mob now creates attack logs.
* Fixed a bug that would allow hookshots to let players clip through walls.

See merge request !144
2015-08-25 23:55:22 +00:00
DeityLink
c94e610e12 hookshot clipping 2015-08-26 01:36:07 +02:00
DeityLink
3e55035c13 hooklogs and fix 2015-08-25 23:59:06 +02:00
D3athrow
828ea034ce Merge branch 'snowflake_the_world' into Bleeding-Edge 2015-08-25 16:55:12 -05:00
Rob Nelson
046671c3de Merge branch 'Bleeding-Edge' of gitlab.com:vgstation/vgstation into Bleeding-Edge 2015-08-25 13:28:37 -07:00
Rob Nelson
5237ad4cd5 Fix broken database migrations for SQLite and muhsql 2015-08-25 13:28:11 -07: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
D3athrow
57c8aa2d22 Merge branch Bleeding-Edge into snowflake_the_world
Conflicts:
	code/game/objects/effects/overlays.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
2015-08-25 04:18:02 -05: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
Crnibombarder
46283d3c6b fugg 3: byond fuggerdome 2015-08-25 08:08:33 +00:00
Crnibombarder
a8e0281c1b fugg 2: electric fuggalo 2015-08-25 08:05:27 +00:00
Crnibombarder
a18c97ec2f fugged it 2015-08-25 08:00:57 +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
Kevin
bf8fb0600d work around for boomboxes being a box 2015-08-24 05:50:03 +00:00
Intigracy
c98bd7e065 fix #93 2015-08-23 22:22:49 -07: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