Commit Graph

6023 Commits

Author SHA1 Message Date
Rob Nelson
16bc6f2e1b Add ethanol effect 2013-11-02 22:07:05 -07:00
Rob Nelson
ecd7783732 HELO I AM PLASWINDOW I DO NOT CONFORM TO YOUR RULES 2013-11-02 19:31:00 -07:00
Rob Nelson
17c07bf8e9 Fix grey eyes, albeit in an ugly way. 2013-11-02 18:57:05 -07:00
Rob Nelson
f92ce33587 Fix husking bug. 2013-11-02 18:48:52 -07:00
Rob Nelson
19cf2e4767 Disable zombies and fix a syringegun bug 2013-10-29 02:09:56 -07:00
Rob Nelson
949ed4f097 Fix some mapping stuff 2013-10-29 01:34:08 -07:00
Rob Nelson
100c7e88f1 Grays snowflakified. 2013-10-28 20:39:22 -07:00
Rob Nelson
bbb524d495 Fixed radiation storm event. 2013-10-28 05:56:14 -07:00
Rob Nelson
5b613c00bb Fix IEDs 2013-10-28 04:26:59 -07:00
Rob Nelson
a5d9f216fe Fix compile, add icons 2013-10-28 00:28:28 -07:00
Rob Nelson
56cfcf1e6e Merge branch 'Hospitality' of github.com:d3athrow/vgstation13 into Bleeding-Edge
Conflicts:
	code/game/machinery/hydroponics.dm
2013-10-27 15:20:57 -07:00
Rob Nelson
6a7463cbc2 Added Grey species 2013-10-26 01:44:47 -07:00
SarahJohnson489
b102224b0c Fixes a apelling error in mine_turfs.dm regarding artifact destruction
"A rumbling noise like [pick("thunder","heavy machinery")]")] somehow penetrates your mind before fadaing away!</b></font>"

to

"A rumbling noise like [pick("thunder","heavy machinery")]")] somehow penetrates your mind before fading away!</b></font>"
2013-10-25 22:19:11 -07:00
d3athrow
dadb31b400 Slimming down the exploit fix 2013-10-24 22:16:15 -05:00
Rob Nelson
5cb1f01906 Spooky alpha didn't update on SetLuminosity. 2013-10-24 19:50:10 -07:00
Rob Nelson
053e86f1a9 Change alpha change to do so in SetLuminosity. 2013-10-24 02:07:59 -07:00
Rob Nelson
35d589a5c7 Boost spooky levels a bit so you can see them juuuust a bit. 2013-10-24 00:33:15 -07:00
Rob Nelson
1f22210d0d Enable ghost spooking in darkness. 2013-10-24 00:26:06 -07:00
Rob Nelson
c4292672cd Ran string combiner, got zilch. 2013-10-23 22:22:01 -07:00
Rob Nelson
c8cc231df6 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2013-10-23 21:45:31 -07:00
Rob Nelson
d366e29e5a Fix robutticist uni ripping on roundstart if fat 2013-10-23 21:44:36 -07:00
d3athrow
4f8e771ccc Fixes a href exploit 2013-10-23 23:32:49 -05:00
Rob Nelson
0b904677a2 Got rid of CMTL alerts 2013-10-23 21:23:22 -07:00
Rob Nelson
a0ac1ff9e7 Tajarans cough up hairballs randomly. 2013-10-23 20:35:13 -07:00
Rob Nelson
8fb7ceeef3 Add green flashing in areas that aren't shielded during radiation storms. 2013-10-23 17:12:16 -07:00
Rob Nelson
894e9a6790 Lock a mob to a defined z-level (for MoMMI spawners on derelict). 2013-10-23 16:09:47 -07:00
Rob Nelson
af84f1fab4 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2013-10-23 02:08:46 -07:00
Rob Nelson
babc838d62 First iteration of zombie code 2013-10-23 02:07:27 -07:00
Rob Nelson
ea1d416dac I'm going to regret this. 2013-10-23 01:51:59 -07:00
d3athrow
776e42a4c3 another sanity check 2013-10-22 19:59:52 -05:00
d3athrow
970c9fafc3 Fixes away missions not loading 2013-10-22 19:59:29 -05:00
Rob Nelson
d05c96efc0 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2013-10-21 16:22:53 -07:00
Rob Nelson
cb3b8c9d29 Figure out max techlevels, make a reference sheet and a tool. 2013-10-21 16:22:38 -07:00
Glandouze
0b677e86f4 Quick fix for an exploit. 2013-10-21 20:30:09 +02:00
Rob Nelson
fac75229b8 Fix a bunch of problems with phazon construction. Phase array still not taking. 2013-10-21 03:42:39 -07:00
SarahJohnson489
fc314c829b Added produce info for Ghost chilis, koibeans and moonflowers. Novaflowers should be over in items/weapons/hydroponics iirc. Possible moonflower issue
Didn't test the Condensed Capsaicin message but based off of the Reishi code it should be good.

Moonflower has Slot_type head and no sprite I could find for it. Not sure if sunflower and it are actually supposed to display on the head but if they are I don't know how to fix it.
2013-10-20 19:48:43 -07:00
Rob Nelson
6d72980e02 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2013-10-20 13:44:36 -07:00
SarahJohnson489
190523a196 Merge pull request #2 from d3athrow/Bleeding-Edge
Grab updates.
2013-10-19 23:10:28 -07:00
d3athrow
bacc987e51 compile fix 2013-10-19 22:51:08 -05:00
d3athrow
f0e348e978 radiation event safe areas 2013-10-19 15:59:34 -05:00
d3athrow
838816afa2 push logging 2013-10-19 15:59:32 -05:00
SarahJohnson489
cb010c8629 Added a message to ingested condensed capsaicin - from TG
Want to get it in while I'm still working on getting Ghost chilis/koi beans/nova flower/moonflower in so I don't forget.
2013-10-19 03:26:34 -07:00
SarahJohnson489
6d8f3b3c5d Added recipe for Cream. 10 milk+1 Sacid yields 5 cream. or 100/5/50 to refill a carton.
Asked in thread and got little response so it's certainly open to change.
2013-10-19 03:21:49 -07:00
Rob Nelson
6b1203cb2e Trying to deconstruct a grinder containing a beaker will result in bitching. 2013-10-18 23:57:54 -07:00
Rob Nelson
3ed5c5ae0d Oops. You saw nothing. 2013-10-18 23:50:41 -07:00
Rob Nelson
a0a91935f3 Condimaster buildable with condimaster board. 2013-10-18 23:48:02 -07:00
Rob Nelson
f8631f3a6e Screwdriver logic on grinder fixed, fixes the message.
Also grammar fix.
2013-10-18 23:39:11 -07:00
SarahJohnson489
8f34137da1 Gives Chem disp, chem master, and grinder component parts
Outstanding issues:
No way to rebuild the condimaster. Needs a multi-tool toggle, machine setting, split off from chem master, whatever. Just something that toggles the condi = 1 variable

Grinder gives a Cannot refine into a reagent. when you open the maint panel and when you crowbar it. Ugly but doesn't impact function

Grinder does not return a large beaker on deconstruction to avoid it being used as a beaker generator. Needs a way to detect beaker on deconstruction and adjust or disallow deconstruction until it is removed or something to that effect.
2013-10-18 21:10:12 -07:00
SarahJohnson489
43eda01fcc Gives SMES their parts 2013-10-18 19:53:59 -07:00
SarahJohnson489
85ffe1b9af Remove cable coils from server components list 2013-10-18 19:51:55 -07:00