Commit Graph

4548 Commits

Author SHA1 Message Date
bawhoppen
af51a66e37 Adds sandbags
* sandbgs an stuff

* mmmm

* fucking sandbags

* okokok

* aaaaaaaaaaaaaaaaaaaaaah
2016-04-02 23:52:12 -04:00
Joan Lung
c3f4f4f9f8 Nar-Sie will now convert girders to cult girders and metal sheets to runed metal sheets
* Nar-Sie will now convert girders to cult girders and metal sheets to runed metal sheets

* qdel(qdel())
2016-04-03 13:41:45 +10:00
KorPhaeron
efe5ec8dbc Merge pull request #16500 from erwgd/SpearIntoLathe
Cable restraints and spears can be recycled in autolathe, but not zipties
2016-04-01 20:47:16 -05:00
Joan Lung
82350431b2 Merge pull request #16439 from KorPhaeron/mecha2
Mining Gear Balance
2016-03-31 22:10:07 -04:00
duncathan salt
0f04ea79a0 Merge pull request #16401 from Tytynguyen/atmosrounding
Atmospheric readings are now accurate to 0.01%
2016-03-31 12:04:48 -06:00
KorPhaeron
03216dce2e Merge pull request #16465 from TehZombehz/foodbox
Adds random ingredient food packages to chefs
2016-03-31 04:03:09 -05:00
TehZombehz
6fb6da13a7 One line change 2016-03-31 03:54:02 -05:00
TehZombehz
229a90ba10 Reorganized for standards 2016-03-31 02:53:52 -05:00
duncathan salt
3d95d68b2f Merge pull request #16279 from Core0verload/HUDfuckery
Slot icons micro-refactor
2016-03-30 23:30:06 -06:00
TehZombehz
0f26065c64 HOPEFULLY removes conflicts
First attempt ev
2016-03-30 17:12:55 -05:00
erwgd
9f3694ba40 Changed materials of wired rod to account for cable restraints 2016-03-30 22:22:06 +01:00
erwgd
d50cc41180 Gave cablecuffs and spear materials list, removed materials from zipties 2016-03-30 22:02:12 +01:00
KorPhaeron
b388e76f9c Knives and thermal protection 2016-03-30 13:28:38 -05:00
KorPhaeron
e3dcebc65e Merge remote-tracking branch 'refs/remotes/tgstation/master' into mecha2
# Conflicts:
#	icons/mob/head.dmi
#	icons/obj/clothing/hats.dmi
2016-03-30 02:12:20 -05:00
duncathan salt
5ff2020202 Merge pull request #16357 from Iamgoofball/fast
Foam and Conveyor Belts now process as fast as possible, Adds the Fast Process subsystem
2016-03-29 20:06:55 -06:00
TehZombehz
2e5012e9d4 Typo
VEGETARIAN
2016-03-29 19:25:47 -05:00
Cheridan
0bb49b1a97 Merge pull request #16440 from TehZombehz/papersack
Adds craftable paper sacks
2016-03-29 11:27:41 -05:00
TehZombehz
acd351bc15 Type replacement 2016-03-29 08:10:04 -05:00
KorPhaeron
53fac5b31d Ruins mining 2016-03-29 03:09:59 -05:00
TehZombehz
da31e890ab Changes Kor requested #1 2016-03-29 01:06:37 -05:00
TehZombehz
326eaf17c6 Small compression 2016-03-28 23:26:23 -05:00
TehZombehz
e13840ffde Adds random ingredient food packages to chefs
Adds various ingredient boxes, a random one of which is chosen for the
chef to start with. Also adds soysauce bottles preset items.
2016-03-28 22:58:03 -05:00
KorPhaeron
9bb1408040 Merge pull request #16424 from RemieRichards/bee_fixes
Bee fixes and updates!
2016-03-28 13:49:42 -05:00
KorPhaeron
8c49ed7053 Merge pull request #16408 from Iamgoofball/patch-14
DEFIB: Splits up "no heart" and "body too old" messages
2016-03-28 12:23:35 -05:00
TehZombehz
a6a338ae76 More typo fixing
I swear I'm good at english
2016-03-28 02:43:21 -05:00
TehZombehz
c83cc45ab2 Regular and smiley paper sack are now wearable if modified
Use a sharp object on an empty regular or smiley face paper sack to
craft their respective wearable paper sack hats.
2016-03-28 01:59:44 -05:00
TehZombehz
fe35d72828 Requirement to hold paper bag to change design removed 2016-03-28 00:01:50 -05:00
TehZombehz
37a3c4373b Adds craftable paper sacks
Adds craftable paper sacks
2016-03-27 23:37:43 -05:00
Remie Richards
17defb66d4 Bee fixes and updates!
* Added the ability to make Apiaries and Honey frames with wood
* Added the ability to make Royal Bee Jelly from 10 Mutagen and 40 Honey
* Added the ability to make more Queen Bees from Royal Bee Jelly by using it on an existing Queen, to split her into two Queens
* Made homeless bees more obvious
* Fixed a typo that made almost all bees homeless, severely reducing the odds of getting honeycomb
* Made bee progress reports (50% towards new honeycomb, etc.) always show, even if it's 0%
* Made some feedback text more obvious
* Fixed being able to duplicate the bee holder object, this was not exploity, just weird
* Fixed being able to put two (or more) queens in the same apiary
* Fixed some runtimes from hydro code assuming a plant gene exists
* Fixed runtime when you use a honeycomb in your hand
* It now takes and uses 5u of a reagent to give a bee that reagent
* Removed unused icon file
2016-03-27 21:07:53 +01:00
Cheridan
07ed2d15b6 Merge pull request #16398 from tgstation/duncathan-patch-1
Make the BOH warning slightly more helpful
2016-03-27 12:32:24 -05:00
Cheridan
f0a0410bfb Merge pull request #16385 from KorPhaeron/FREEGOLEM
Adds missing file for FREE GOLEMS
2016-03-27 11:37:54 -05:00
Cheridan
eeeff80e5f Merge pull request #16366 from Xhuis/the_forbidden_art_of_fixing_issues
Fix bundle
2016-03-26 21:06:00 -05:00
Cheridan
a8121204fe Merge pull request #16362 from Bawhoppen/minormedicalbuff
makes bruise packs and ointment not shit
2016-03-26 20:12:56 -05:00
Iamgoofball
8a4c356e99 DEFIB: Splits up "no heart" and "body too old" messages
This was confusing new players.
2016-03-26 16:12:09 -07:00
Tytynguyen
91f618a5a7 Atmospheric readings are now accurate to 0.01% 2016-03-26 13:43:20 -07:00
duncathan salt
7759b823da I like trustygun's idea 2016-03-26 14:13:27 -06:00
Cheridan
004e59864a Merge pull request #16261 from Core0verload/pda_close
Kills snowflakey PDA close button
2016-03-26 14:30:07 -05:00
Xhuis
cc62b89baf Fix bundle 2016-03-26 15:15:31 -04:00
duncathan salt
0fd7310f41 Update backpack.dm 2016-03-26 10:08:52 -06:00
KorPhaeron
5f06b3f5cf Missing ID card 2016-03-26 02:08:14 -05:00
Lularian
aa5923dd39 medical stuff 2016-03-25 13:06:37 -05:00
AndrewJacksonThe2nd
f54132e74b Foam and Conveyor Belts now process as fast as possible, Adds the Fast Process subsystem 2016-03-25 03:56:01 -07:00
Lzimann
ad111138b2 I'm a skrub 2016-03-24 18:25:02 -03:00
Cheridan
fdbde58dd4 Merge pull request #16300 from Bawhoppen/minorboxspritefix
Fixes a box sprite
2016-03-24 12:06:01 -05:00
Lularian
b8138cc799 please forgive 2016-03-23 14:04:42 -05:00
bawhoppen
ab947d1868 nevermind about that spare shell 2016-03-23 03:08:41 -05:00
Lularian
79ea910a64 box 2016-03-23 02:56:12 -05:00
AnturK
b6b8a3eb09 Merge pull request #16260 from Bawhoppen/grenadesholyshithelp
Grenade belt for nukeops
2016-03-22 19:35:43 +01:00
c0
f71ab62e79 HUD item slots no longer show item placeholders when there are actual items inside 2016-03-22 08:00:38 +03:00
Cheridan
7627e1c0e2 Merge pull request #15859 from Core0verload/wall_flash
Wall mounted flashes are now buildable
2016-03-21 12:32:55 -05:00