Isratosh
fa122fe793
Adding admin logs to bluespace shelter capsules.
...
* Adding admin logs to bluespace shelter capsules.
* Only logs when not on mining or lavaland z level
2016-04-02 02:42:18 -06:00
KorPhaeron
bb3d04d351
Merge pull request #16526 from LatD/NutriMax
...
More plant analyzers to NutriMax
2016-04-01 19:53:36 -05:00
KorPhaeron
826844ecc6
Merge pull request #16504 from Eaglendia/fashion2
...
Improves selections for head of staff fashion
2016-03-31 22:06:29 -05:00
Joan Lung
82350431b2
Merge pull request #16439 from KorPhaeron/mecha2
...
Mining Gear Balance
2016-03-31 22:10:07 -04:00
KorPhaeron
2be10e302f
Uses temp overlays for material scanners
2016-03-31 17:15:06 -05:00
KorPhaeron
f2d5345093
Mesons
2016-03-31 17:02:50 -05:00
LatD
62f93b7a32
Adds hydrogen to grass
2016-04-01 00:09:33 +03:00
duncathan salt
1d32467096
Merge pull request #16496 from ChangelingRain/edgecases
...
Fixes edge case where it was possible to get multiple parasites without admin intervention
2016-03-31 12:20:41 -06:00
duncathan salt
8825858d9c
Merge pull request #16492 from coiax/name-my-golems
...
Lavaland Golems have a larger naming pool
2016-03-31 12:20:10 -06:00
duncathan salt
b2cd470024
Merge pull request #16480 from erwgd/BiogenAscend
...
Biogenerator and botany bottle improvements
2016-03-31 12:16:43 -06:00
duncathan salt
bcc92cf76f
Merge pull request #16471 from Core0verload/events
...
Adds minimal players requirements for random events
2016-03-31 12:14:44 -06:00
duncathan salt
f568ae3f31
Merge pull request #16425 from Thunder12345/varspotting
...
Adds new atom and new datum options to viewvars
2016-03-31 12:07:14 -06:00
duncathan salt
1183681424
Merge pull request #16393 from KorPhaeron/triggerwarninggoofball
...
Math with goofball: Part 2
2016-03-31 12:03:39 -06:00
duncathan salt
3315717ef9
Merge pull request #16348 from Shadowlight213/adminsoundvolume
...
Adds client volume control for admin sounds.
2016-03-31 11:59:52 -06:00
KorPhaeron
55434a673d
Heavy Weapon Fix
2016-03-31 12:23:46 -05:00
KorPhaeron
40023cf843
Merge pull request #16495 from ChangelingRain/dazedzinnia
...
Daisy and Zinnia holoparasites no longer try to kill your eyes
2016-03-31 11:40:15 -05:00
erwgd
5fc02ccee8
moved all returns in generation ifs to new lines
2016-03-31 15:14:28 +01:00
erwgd
0109c274fb
moved returns to new lines, put 10u black pepper
2016-03-31 15:09:45 +01: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
KorPhaeron
a74b7c209c
Mining Drone Upgrades
2016-03-31 03:41:03 -05:00
TehZombehz
229a90ba10
Reorganized for standards
2016-03-31 02:53:52 -05:00
duncathan salt
1ff5882696
Merge pull request #16473 from KorPhaeron/goliath_meat
...
Goliath changes
2016-03-31 00:35:13 -06:00
Eaglendia
d38e3e7cc1
Adds more options for CE and RD cloaks
2016-03-31 00:34:59 -05:00
duncathan salt
3d95d68b2f
Merge pull request #16279 from Core0verload/HUDfuckery
...
Slot icons micro-refactor
2016-03-30 23:30:06 -06:00
KorPhaeron
507b48f8a3
Merge pull request #16476 from ChangelingRain/charrrrrrge
...
Adds charger holoparasites to traitor
2016-03-30 21:39:29 -05:00
KorPhaeron
41dc2df094
Merge pull request #16491 from bgobandit/speeling
...
Fixes spelling in cargo crates
2016-03-30 19:50:03 -05:00
KorPhaeron
721ef94443
Fixes icons for real
2016-03-30 17:51:28 -05:00
Eaglendia
c706c9d2e9
Allows the head of staff cloaks to equip some signature items
2016-03-30 17:43:01 -05:00
KorPhaeron
9711586a70
Icon Fix
2016-03-30 17:31:40 -05:00
TehZombehz
0f26065c64
HOPEFULLY removes conflicts
...
First attempt ev
2016-03-30 17:12:55 -05:00
KorPhaeron
b388e76f9c
Knives and thermal protection
2016-03-30 13:28:38 -05:00
KorPhaeron
fad0e3934e
Fixes recoil, re-adds suit icon toggling
2016-03-30 13:11:33 -05:00
Remie Richards
20597d0079
Merge pull request #16164 from Robustin/classiczombies
...
Make zombies 2spooky
2016-03-30 16:03:48 +01:00
Nerd Lord
323ccce61b
Fixes edge case where it was possible to get multiple parasites without admin intervention
2016-03-30 10:08:29 -04:00
Nerd Lord
6db538ef77
Daisy and Zinnia holoparasites no longer try to kill your eyes
2016-03-30 10:00:22 -04:00
Jack Edge
5c5734b006
More complicated golem name creation
...
Free Golems now have names of the form MATERIAL SURNAME, where SURNAME
tends to be geological terms or rock types. Very occasionally, human
surnames creep in.
2016-03-30 09:38:10 +01:00
KorPhaeron
f521cb2f90
Merge pull request #16460 from TehZombehz/honeyfood
...
Adds some honey foods | Changes mead recipe
2016-03-30 03:26:15 -05:00
bgobandit
0ee9691575
Fixes and standardizes spelling
2016-03-30 04:14:07 -04:00
TehZombehz
fa98ae963e
Updates nutritional content with honey
...
Since honey supposedly also acts as a mild healing chemical, replacing
vitamin with honey seems optimal.
2016-03-30 03:07:27 -05:00
KorPhaeron
2a5fba89fd
Merge pull request #16472 from coiax/gieger-in-suit-storage
...
Added: Radiation suit storage holds gieger counter
2016-03-30 02:28:47 -05:00
KorPhaeron
e6c52aa5b3
Merge pull request #16468 from PKPenguin321/patch-16
...
Scales back grab nerf
2016-03-30 02:27:59 -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
KorPhaeron
d987bc0aad
Temperature resist
2016-03-30 01:43:50 -05:00
KorPhaeron
ca5b67e119
Explorer Gear
2016-03-30 01:27:22 -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
Xhuis
b44fa098ac
Fixes animated statues being invisible
2016-03-29 19:56:33 -04:00
c0
9f4e6c6c42
Adds two new events-related config options
2016-03-30 02:16:04 +03:00
erwgd
ec3a9066f8
moved pepper buttons away from rows of dairy product buttons in biogenerator.dm
2016-03-29 19:38:57 +01:00
Cheridan
4df97395bd
Merge pull request #16436 from ExcessiveUseOfCobblestone/patch-1
...
You must be 18 or older to play
2016-03-29 13:30:38 -05:00
erwgd
c1c255a663
Fixed weed and pest killer bottles; added empty botany bottles; added empty bottles and black pepper to biogenerator; formatting edits in biogenerator.dm and descriptions added to bottles in hydroitemdefines.dm
2016-03-29 19:26:49 +01:00