08d5b5907a
Fortune cookies can be made with blank or "blank" paper. Allows cult talisman paper to be baked into cookies, fixing the last bit of issue #298 .
2014-05-19 18:21:17 -04:00
1d4a6c5d26
Merge branch 'master' into slimes
...
Conflicts:
code/modules/mob/living/carbon/metroid/metroid.dm
2014-05-18 21:38:25 +04:00
ed5f8a0ee6
Fixes, part 1
2014-05-18 21:27:40 +04:00
5f7875f4de
Replaced the "not used anymore" command_alert with the new "priority_annonce" proc, making the code compilable again.
2014-05-18 11:50:25 +02:00
9066cccf9c
Merge pull request #3645 from Ikarrus/announcements
...
Priority Announcement Changes
2014-05-18 02:07:55 +01:00
36bb032957
Merge pull request #3509 from Cheridan/MeteorsSuck
...
Meteor Stuff
2014-05-17 18:42:16 -05:00
86e36fb934
Merge pull request #3598 from phil235/ConstructHitFix
...
Stops constructs from hitting themselves
2014-05-15 12:56:38 -05:00
a016d1463a
Merge pull request #3608 from hornygranny/lookmanohands
...
Fixes #3157
2014-05-15 12:50:22 -05:00
503fa19098
Merge pull request #3695 from Menshin/powernets_alternative_refactoring
...
Updated Powernets Refactoring
2014-05-15 13:55:01 +01:00
e87d84fbe4
Merge pull request #3694 from Rolan7/Issue2883-medal
...
Medal of Captaincy is no longer twice as large.
2014-05-15 11:55:57 +01:00
758d9a38d7
Merge pull request #3649 from Cheridan/vitallyimportant
...
Less Hydro Trash
2014-05-14 16:11:34 +01:00
01c28c7afc
Fixed indentations.
2014-05-14 09:02:53 -06:00
ea3d4b35c4
fixing conflict
2014-05-14 10:01:29 -05:00
8496ec8dd1
Should be auto-mergable again
2014-05-14 08:57:52 -06:00
3073d284ba
Merge branch 'master' of https://github.com/tgstation/-tg-station into vitallyimportant
2014-05-14 09:52:47 -05:00
56d5412e50
Merge branch 'master' of https://github.com/tgstation/-tg-station into announcements
2014-05-14 08:34:49 -06:00
8aaa5a4b19
Merge pull request #3602 from GunHog/Advanced_HUDs
...
Adds Nightvision Medical and Security HUDs!
2014-05-14 11:06:03 +01:00
f66253020e
Merge pull request #3651 from Cheridan/areaSounds
...
Area Ambiance Refactor
2014-05-14 11:04:02 +01:00
3247358c6d
Merge pull request #3480 from AstralSerpent/master
...
"NAR-SIE HAS RISEN" gets accompanied by an "I'M HERE" sound.
2014-05-14 10:39:10 +01:00
b35097ae83
Merge pull request #3633 from Menshin/powernets_refactoring
...
[RFC] Powernets refactoring
2014-05-14 10:21:21 +01:00
e2878e2e0e
Merge pull request #3624 from phil235/SyringeDrawFix
...
Adds a timer when drawing blood from other people.
2014-05-14 10:20:13 +01:00
9b660c9461
Merge pull request #3663 from Rolan7/Issue146-CyborgHandoffs
...
Fixes issue #146 , borgs placing modules on people
2014-05-14 10:18:31 +01:00
0ea1361175
Merge pull request #3674 from Ikarrus/rangeinst
...
[MAP] Firing Range Instructions
2014-05-14 09:59:06 +01:00
3468c832a1
Merge pull request #3667 from MrStonedOne/adminpermfix
...
Minor fixes to admin permissions
2014-05-14 09:57:00 +01:00
6686b2ec7c
Merge pull request #3687 from Jordie0608/removerelativepathsfromtheeverythingplz
...
Fixes #3681 : suicide messages when crit
2014-05-14 09:24:29 +01:00
ab1dd6fc0d
Medal of Captaincy is no longer twice as large.
...
Fixes issue #2883 and a minor bug where set-equipment wasn't properly equipping "assassins" with waistcoats. Both cases now use the existing attachTie method, which exists for this reason.
2014-05-14 02:14:28 -04:00
3a0bd3de28
Merge branch 'master' of https://github.com/tgstation/-tg-station into MeteorsSuck
...
Conflicts:
code/game/turfs/simulated/walls.dm
2014-05-13 14:03:42 -05:00
789dcf52bb
Merge pull request #3557 from Ikarrus/thermitescale
...
Thermite Effectiveness Scaling with Volume and Wall Type
2014-05-13 20:14:01 +02:00
e13ab9422d
Merge pull request #3610 from Aranclanos/washingmachine
...
Washing machine fixes
2014-05-13 16:55:26 +01:00
4761e02904
Maybe i should make sure the code complies before pushing it next time
2014-05-13 02:32:56 +10:00
4078973a5c
Unidentinization
2014-05-13 02:18:21 +10:00
dfd2cc4b60
Changed suicide messages to visible_messages and fixed relative pathing
2014-05-13 01:44:29 +10:00
593c95cc4f
[MAP] Firing Range Instructions
...
-Added instructions to the firing range.
-Set a default path for the controls
-Controls are no longer dense
2014-05-10 19:53:48 -06:00
2269a2f168
Alternative version of the powernets refactoring (cables connects if they have matching ends)
2014-05-11 00:04:49 +02:00
d41ee9ee8a
Why the hell not
2014-05-11 00:47:16 +04:00
d871779432
Replaced the isRobot() check with two new functions, one of which is overloaded for robots. Object oriented programming intensifies!
2014-05-09 18:03:49 -04:00
b3d1e87b1f
Merge branch 'master' of https://github.com/tgstation/-tg-station into documents
2014-05-08 20:18:57 -06:00
a4e4e2bcce
Admins without +admin can use jmp herfs while ghosted
...
They already have access to jump to mob and follow, so no reason to deny them this.
Only allows access to jmp herfs while ghosted.
2014-05-08 13:19:26 -07:00
b607d50e7a
Admins lacking +admin get admin pm stuff
...
They can use like 50 herf links to do this already, including rightclick mob -> view vars -> player panel -> pm
2014-05-08 13:17:23 -07:00
5b219ea119
Fixes issue #146 , borgs placing modules on people
...
Simple fix for this one...
2014-05-07 14:54:35 -04:00
a0279416f1
Merge pull request #3647 from Jordie0608/msoisatheifhalthalthalthalt
...
Changed mining equipment locker to mining equipment vendor
2014-05-07 17:25:22 +02:00
a392da16b0
Area Ambiance Refactor
2014-05-06 21:40:28 -05:00
e2a2b15706
2-unit setting
2014-05-06 19:16:17 -05:00
ab226de343
Makes nutrient bottles larger, reduces amount in vendor/generator to compensate.
2014-05-06 18:55:38 -05:00
1848e619cd
Merge pull request #3642 from Zelacks/empiconfix
...
Emp backpack Icon fix
2014-05-06 20:11:49 +01:00
7091c012e9
Merge pull request #3625 from Giacom/gravity_layer
...
You can now walk behind the three top parts of the gravity generator, to...
2014-05-06 20:08:00 +01:00
8a731f3bdc
Merge pull request #3568 from Giacom/rip_cyborg_inventory_bugs
...
Fixes #3565 . Added a "put_in_hand_check" which returns 1 if the item can be equipped ...
2014-05-06 20:07:49 +01:00
5098d78a48
Merge pull request #3603 from hornygranny/jesuschristhowhorrifying
...
increases narsie spooky level
2014-05-06 19:49:29 +01:00
f615b60c2a
dust now uses spawn_dust()
2014-05-06 11:46:25 -07:00
1d981b9173
flavor text removed
2014-05-06 11:44:03 -07:00
Rolan7
Kelenius
Menshin
Alex
Cheridan
ikarrus
Miauw62
fleure
Jordie0608
Menshin
MrStonedOne
Hornygranny