Commit Graph

979 Commits

Author SHA1 Message Date
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
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
DeityLink
45fb48694c Turrets and Mecha projectiles fixes 2015-08-24 00:28:01 +02:00
ComicIronic
f5a65fbdcc Merge pull request #5403 from DeityLink/gunnss
[Experimental Guns] No.1: Ricochet Rifle, also a few fixes
2015-08-23 23:54:27 +02:00
unid15
7c97942633 changelog, fixes baby carps, changes metabolism of pheromones 2015-08-22 17:47:11 +02:00
unid15
23cd34872b fixes corgi meat objective 2015-08-21 19:55:16 +02:00
d3athrow
1f2438db42 Merge branch 'run-run-run-run' into 'Bleeding-Edge'
More runtime fixes.

See merge request !104
2015-08-20 08:11:33 +00:00
unid15
421a1a77b5 final touches 2015-08-20 03:35:49 +02:00
unid15
660d64a278 removes unused thing, slightly changes recipe and effect 2015-08-20 01:21:43 +02:00
unid15
fbca5f3985 carp pheromones 1.0 2015-08-20 01:02:25 +02:00
Rob Nelson
8919529bbd Merge branch 'fixings' into 'Bleeding-Edge'
Chemmaster UI fix.

Thanks dylan.

Fixes #86

See merge request !115
2015-08-19 19:31:41 +00:00
DeityLink
d93329639a condiment attack_self 2015-08-19 19:52:31 +02:00
DeityLink
e9cbdb85ec bugfixes and better food sprites 2015-08-19 19:32:15 +02:00
PJB3005
37501cbc80 Chemmaster UI fix.
Thanks dylan.

Fixes #86
2015-08-19 15:10:55 +02:00
PJB3005
878d6d4d91 More runtime fixes. 2015-08-19 01:07:08 +02:00
DeityLink
d74c985aaf BEEKEEPING 2.0 2015-08-18 19:28:48 +00:00
DeityLink
d1448601a0 applejuice and goodbye glass of ...what? 2015-08-17 22:16:02 +00:00
PJB3005
9d7ff729b6 Atom locking 2015-08-15 15:06:04 +02:00
unid15
ffe1721ada put a bangin donk on it 2015-08-14 23:47:28 +00:00
Zth
9bb964948b imidazoline and mesons 2015-08-14 04:54:36 +00:00
D3athrow
6570cdb5b2 slips for days johnny 2015-08-13 14:27:51 -05:00
unid15
e1f8b6f0d4 no broken icons 2015-08-13 05:44:26 +00:00
Unfit
40ae65a851 USER and not USSR 2015-08-13 05:44:26 +00:00
Unfit
745ec1776a :godmode: 2015-08-13 05:44:25 +00:00
Unfit
6a68f4b3b8 aaaaa 2015-08-13 05:44:25 +00:00
Unfit
a59a49eee5 fuck you clowns 2015-08-13 05:44:25 +00:00
Shadowmech88
a8476a7ca6 Attempting to squash my stuff. 2015-08-11 03:10:17 +00:00
dylanstrategie
c784357d08 Remove unintentional hardcode 2015-08-07 02:43:55 +00:00
dylanstrategie
10699b20ca Requested Fixes 2015-08-07 02:43:54 +00:00
dylanstrategie
e74b6c9262 Improve the Chemmaster 2015-08-07 02:43:54 +00:00
dylanstrategie
c6e238ec24 Revamp the Scoreboard 2015-08-06 23:08:47 +00:00
PJB3005
59efbdf0af Lowers water metabolism rate, to make it less lethal to greys. 2015-08-06 17:23:26 +00:00
DeityLink
7ad99d0bd4 typos 2015-08-06 01:02:22 +00:00
dylanstrategie
dac2e27ad6 Bring back Chaplain tweaks 2015-08-04 23:20:49 +02:00
Arthurdentist
6d2ae77155 Fixes Grey Tea Sprite
Icon_State for Grey Tea was incorrect
2015-08-02 04:28:06 +01:00
PJB3005
bacafad4c4 RPED from TG.
With /vg/ added flavour too!
2015-07-31 18:10:01 +02:00
Kurfursten
1276703a3d Delicious pie 2015-07-27 21:50:17 -05:00
Kurfursten
342b34f3f2 deus ex machina 2015-07-24 01:46:23 -05:00
d3athrow
e585a08b3e Merge pull request #5428 from PJB3005/FULL-OF-SHIT
Reverts DAL.
2015-07-22 19:25:25 -05:00
Intigracy
5dce72b1a9 Fixes #4847
Fixes #4538
2015-07-22 01:05:04 -07:00
PJB3005
3bc5d86263 LIGHTING IS BACK.
AND A SHITLOAD FASTER.

SANIC.
2015-07-21 14:16:27 +02:00
D3athrow
54a563cb0d fix #5400 2015-07-21 00:38:55 -05:00
D3athrow
cb893e342e borgs cant leave their beaker in a thing and walk away 2015-07-21 00:12:14 -05:00
D3athrow
d59f6a07b0 comment out panicwriter and saytesting 2015-07-20 16:04:48 -05:00
D3athrow
7a3ff4efc3 THE LIGHTING IS DEAD, LONG LIVE DAL 2015-07-18 23:05:18 -05:00
DeityLink
1a2e246497 Experimental Guns No1. Ricochet Rifle 2015-07-18 12:30:51 +02:00
D3athrow
41d7df01fd just fuck my shit up 2015-07-18 02:30:51 -05:00
clusterfack
6293688af9 Removes more manual del() calls
-Lots of things
-They all call delete
-Lots call spawn() unnecessarily
-They should garbage collect or be pooled now
2015-07-16 00:54:24 -05:00
Arthurdentist
49a0c32bb9 Closed potential exploit 2015-07-14 03:22:48 +01:00
Arthurdentist
3093300b8a emp chem change 2015-07-12 02:54:15 +01:00