Commit Graph

11000 Commits

Author SHA1 Message Date
DeityLink
5a3e76d391 fixes and turrets 2015-08-28 03:01:21 +02:00
Rob Nelson
6ab85b5a83 Range limit on bee wandering. Will eventually be upgradable. 2015-08-27 13:50:17 -07:00
Rob Nelson
4e60ed33d9 Merge branch 'Bleeding-Edge' of gitlab.com:vgstation/vgstation into Bleeding-Edge 2015-08-27 11:18:52 -07:00
d3athrow
ca5960c1eb Merge branch 'fixingarenas' into 'Bleeding-Edge'
Bomberman fixes and camera hearing

* Hopefully fixes Bomberman Arenas not properly putting players inside the spawned Bombermen
* Bomberman Arenas with more than 2 players now starts a 60 seconds countdown as soon as 2 players have registered, Which for example allows 2-9 players to fight on the 10-players map without requiring an admin to force-start the round.
* Thunderdome/Arena cameras are now fucking indestructible.
* You can now add voice analyzers to cameras, which will allow people near security camera computers connected to them to hear what people in view of those cameras are saying. Entertainment monitors broadcast to everyone that can see them.

See merge request !146
2015-08-27 18:14:46 +00:00
d3athrow
b56ab673c8 Merge branch 'balance' into 'Bleeding-Edge'
Removing hookshot knockdown

* Hookshots no longer knock you down when they reel you in, no matter which intent you're on.

See merge request !147
2015-08-27 18:14:20 +00:00
DeityLink
510c11da7e virtualhearers exception 2015-08-27 15:58:29 +02:00
DeityLink
1fa2590553 removing hookshot knockdown 2015-08-27 15:39:20 +02:00
DeityLink
85adc18f39 bomberman fixes and camera hearing 2015-08-27 15:23:06 +02:00
d3athrow
ae5914ec79 Merge branch 'showface' into 'Bleeding-Edge'
Transparent hoods and helmets that don't hide your face no longer hide your glasses or beard

* Beekeeper hood no longer hides your hair, facial hair, glasses, or headset
* Anomaly hood no longer hides your facial hair or glasses

See merge request !128
2015-08-27 08:00:59 +00:00
Rob Nelson
2e4cda1bfb Merge branch 'Bleeding-Edge' of gitlab.com:vgstation/vgstation into Bleeding-Edge 2015-08-26 22:28:14 -07:00
Rob Nelson
469c7a8db7 Get rid of last traces of Skills shit, I think. 2015-08-26 22:27:50 -07:00
D3athrow
2d3240bf34 maybe fix votes randomly not coming up 2015-08-26 23:12:08 -05:00
D3athrow
0b1d78b01d warning 2015-08-26 23:01:44 -05:00
D3athrow
b135848852 fuck 2015-08-26 22:31:25 -05:00
D3athrow
7a931bf0cb zibzab tweaks.
beam projectiles entering a time bubble will properly fade off their trailing beam and restart when leaving it.
Silicons now take 33% less damage from lightning spell due to them taking brute damage from the EMP
lightning properly doesn't stun anymore.
2015-08-26 22:18:52 -05: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
DeityLink
448c7ff035 polishing 2015-08-25 20:55:09 +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
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