Commit Graph

11794 Commits

Author SHA1 Message Date
Sood
3177b3af13 Reverted admin debug changes, nulled references after qdels 2015-12-06 15:11:57 -08:00
Sood
3cdf89b675 qdel replacing del, time for bugs 2015-12-06 15:11:15 -08:00
Rob Nelson
ba91692085 Merge pull request #6889 from dylanstrategie/Chem-Hotfix
If you're going to overwrite, at least try to figure out what the changes were
2015-12-06 15:06:17 -08:00
Rob Nelson
464e857f40 Merge pull request #6892 from unid15/why_the_fuck_wasnt_this_a_thing
Adds two mob helper procs
2015-12-06 15:05:46 -08:00
D3athrow
c5d4ae2910 fix when 2015-12-06 15:18:44 -06:00
unid15
2b13be60d7 adds mob/isUnconscious() and mob/isDead() 2015-12-06 20:27:58 +01:00
dylanstrategie
33d87c95ad If you're going to overwrite, at least try to figure out what the changes were 2015-12-06 17:56:46 +01:00
D3athrow
e7b583ff29 Proper fix to prevent RPD from making a thing while storing it. 2015-12-05 15:38:34 -06:00
D3athrow
0571df3515 Fixes RCD deriatives going into storage while trying to make something
If someone else has a better idea on how to fix this feel free to. (reverted from commit cef7e69c7a)
2015-12-05 15:37:15 -06:00
Rob Nelson
9b3295c26a Merge pull request #6881 from unid15/wod
Woodcutting
2015-12-05 11:52:10 -08:00
Rob Nelson
55a340d988 Merge pull request #6872 from Probe1/ArnoldPalmer
Adds an Arnold Palmer to the game with a new sprite for it.
2015-12-05 11:51:27 -08:00
Rob Nelson
07e26a7982 Merge pull request #6876 from Probe1/Achievement_Cancel
Fixes #6873
2015-12-05 11:49:29 -08:00
unid15
93a458fce1 remove ancient stuff, explosives have an effect on the trees 2015-12-05 18:31:00 +01:00
ririchiyo
cef7e69c7a Fixes RCD deriatives going into storage while trying to make something
If someone else has a better idea on how to fix this feel free to.
2015-12-05 12:30:03 -05:00
ririchiyo
e07443bdb0 lets actually look over these changes before we merge them and ban dylan from
making any formatting changes in the future.
2015-12-05 11:58:42 -05:00
Probe1
c577ec546a Adds if(achoice == Cancel) return. It works but I don't understand why.
Adds cancel to player list stage

This should NOT have taken 3 commits and 2 hours!

all steps but final step have cancel
2015-12-05 08:32:35 -05:00
unid15
a02bfa6abd woodcutting 1.0 2015-12-05 11:57:37 +01:00
Probe1
75a2a210da Adds an Arnold Palmer to the game with a new sprite for it.
Better icon 4 u

best sprite

Changelog and squish commits
2015-12-05 04:56:34 -05:00
Rob Nelson
6b99c02983 Merge pull request #6806 from dylanstrategie/Chem-Hotfix-V2
Chemistry Sanity Redux
2015-12-04 12:34:47 -08:00
Rob Nelson
e9b1da9b5b Merge pull request #6790 from Arthurdentist/summonrobe
Adds a Summon Robes Spell
2015-12-04 00:34:47 -08:00
Rob Nelson
b6a8b4a686 Merge pull request #6849 from dylanstrategie/Fucking-Recipes
Change Brown Star recipe
2015-12-03 18:33:54 -08:00
Rob Nelson
95b53a38be Merge pull request #6850 from Kurfursten/vchf
fixes #6819
2015-12-03 18:33:32 -08:00
Rob Nelson
99d783cbb3 Merge pull request #6853 from 9600bauds/wheresthebombwheresthebombwheresthebombwheresthebombwheresthebombwheresthebomb
Adds Cuban Pete bombs as a rare prize from non-emagged arcade machines
2015-12-03 18:32:54 -08:00
9600bauds
42a8f8889c Adds bombs as arcade prizes. 2015-12-03 12:23:05 -03:00
D3athrow
664084688e Properly fix #6641 2015-12-03 01:16:55 -06:00
Kurfursten
b75ade89c3 HE'S A MANIAC 2015-12-02 22:02:43 -06:00
dylanstrategie
45782f2110 Tweak B52 recipe 2015-12-03 03:24:19 +01:00
dylanstrategie
3f0978d449 Change Brown Star recipe 2015-12-03 03:20:13 +01:00
Rob Nelson
21ac6a599a Merge pull request #6792 from Probe1/Box_changes
Box changes
2015-12-02 16:51:06 -08:00
clusterfack
fd08469c30 Merge pull request #6813 from NigglyWiggly/FUCKING-SPACE-CORGIS-
CORGIS IN SPACE
2015-12-02 13:15:44 -06:00
clusterfack
b9adde7e28 Part deux
Same thing as the last one
2015-12-01 19:06:18 -06:00
PJB3005
d8dda8c854 Revert "String Concatenation" 2015-12-02 00:08:13 +01:00
clusterfack
c5b3c999a6 Merge pull request #6820 from clusterfack/concatenation
String Concatenation
2015-12-01 16:01:05 -06:00
clusterfack
6d93bd26d1 String Concatenation
Converts to list2text()
2015-12-01 15:51:11 -06:00
NigglyWiggly
88d8833a98 LOOK MOM I FIXED IT
I hope
2015-12-01 11:07:47 -05:00
D3athrow
3a3e6790d0 attempted login messages for sql bans 2015-11-30 23:58:54 -06:00
NigglyWiggly
3eb815c123 ;-; 2015-11-30 23:29:03 -05:00
NigglyWiggly
3bba5ef0fc I'm sorry
Desc = "It's the Description"
2015-11-30 23:26:45 -05:00
Probe1
461c29058c Closes https://github.com/d3athrow/vgstation13/issues/6681 by moving the junction a few tiles west and redoing the piping just a tiny bit to accomodate it.
clean map dumbass probe

Okay junctions don't work how I thought so here's Take 2

Resolves https://github.com/d3athrow/vgstation13/issues/6542 .  Adds a new area "Permanent Confinement" along with a new icon for it rather than just re-using other icons like everything else.  Adds a new APC for perma.  This will cut down on prison wing always running out of power well before the rest of the station.

Fixes https://github.com/d3athrow/vgstation13/issues/6559 by the power of copy and paste!

Adds a mailman outfit and hat to a personal locker in the locker room based off of feedback from the thread.

Significant alteration to botany back room and the adjacent maint to accomodate it.  It was expanded by 1x9 tiles, the grinder was moved into the back room, and a paperbin, pen, folder, chair, and 3 tables were added.  This has been requested for 6 months.  Someone requested it in the thread and reminded me.

Adds sec_perma area to the exception list for radiation storms.  Also secretly moves the mailman suit to a hidden location near cargo, good thing no one reads commits other than coders.

Removes the sink from botany, switches the lysis and bioballistic machines, and modifies the waste line and scrubber to not be so spaghetti.

Adds two magboots to the racks in Research Expedition Prep room, a long requested feature. Tweaks botany back room to have a little more space by the door.

Overhauls xenobotany at the research outpost

Adds new area/research_outpost/xenobot.  Few minor tweaks to xenobot.

Final smoothing out of xenobotany at the outpost.  Adds a wrench, moves a camera, removes some metal and glass to another location.

Dir 10 was the solution to my ugly tiles.

forgot to map merge

removes exotic seeds based on feedback

changelog and fixing a goof in the example changelog where del was described as adding and add was described as deleting

Fixes an errant research hall area in the research shuttle bay, causing fires to trigger alarm overlays in a safe area.  Also removes the weird ass tiles in the bar that merely LOOKED like wooden tiles, but were really metal tiles painted to appear as wood.  I don't even know man.
2015-11-30 23:15:38 -05:00
NigglyWiggly
ebaec31cbe CORGIS IN SPACE
WE'LL DO IT LIVE.
FUCK IT.
2015-11-30 22:29:43 -05:00
clusterfack
5c6aa5aedb Merge pull request #6796 from clusterfack/power
Unifies powernet/power machinery
2015-11-30 20:18:53 -06:00
clusterfack
1a1169b4b5 Merge pull request #6801 from clusterfack/crew
Crewmonitor using correct job
2015-11-30 20:18:30 -06:00
dylanstrategie
7d20b1ee32 Fix accidental exponentialism of alcohol effects 2015-11-30 23:57:15 +01:00
dylanstrategie
7e9abb9860 Chemistry Sanity Redux 2015-11-30 21:57:08 +01:00
clusterfack
e02b9cf915 Crewmonitor using correct job
Fixes #6744
- Fixes 2 missing jobs and 2 incorrect jobs from the crew monitoring computer
- Makes the crew monitoring computer use RANK to sort instead of ASSIGNMENT, rank is the true job value and assignment is the value to the alternate job title, we want to use rank so we don't need to write down every alt title
2015-11-30 09:47:15 -06:00
clusterfack
428a2fbcc0 Unifies powernet/power machinery
Will likely fix some bugs where powernets seem to drop off for a tick then come back double.

Also modifies power machines back to their original ~2 second workload time. The original change from 2 -> 4 seconds was pretty dumb (and not discussed by anyone) because it made things like supermatter and singulo extremely less lethal. Also power machines barely even use any processing time in the first place so it makes minimal difference lag-wise whether it is 2 or 4 seconds between processes
2015-11-30 06:11:16 -06:00
Arthurdentist
53847d6fb6 fix thing 2015-11-30 09:54:52 +00:00
Rob Nelson
01f2c75ae2 Merge pull request #6784 from PJB3005/winexist
FINALLY fixes the asset cache runtimes.
2015-11-29 18:06:23 -08:00
Rob Nelson
c3bba1f27d Merge pull request #6782 from clusterfack/wabbajack
Fix #6778
2015-11-29 18:06:15 -08:00
Rob Nelson
f2ed8c38db Merge pull request #6779 from clusterfack/imnuclear
Fixes #6768
2015-11-29 18:05:58 -08:00