ea3d4b35c4
fixing conflict
2014-05-14 10:01:29 -05:00
3073d284ba
Merge branch 'master' of https://github.com/tgstation/-tg-station into vitallyimportant
2014-05-14 09:52:47 -05: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
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
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
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
6530150120
Changed mining equipment locker to mining equipment vendor
2014-05-06 20:01:01 +10:00
38b56975f5
Merge pull request #3591 from Aranclanos/ghostize
...
Mindless ghosts fix
2014-05-06 08:14:46 +01:00
d79cc315bf
Emp Icon fix Commit
2014-05-06 02:55:58 +08:00
034fd18020
Merge pull request #3589 from Aranclanos/LightsBrightness
...
Light tubes and bulbs brightness
2014-05-05 12:29:40 -05:00
282a5d3a2b
Merge pull request #3379 from Cheridan/sliceofpai
...
Refactors pAI law code...
2014-05-05 07:33:17 -07:00
d42c7114c1
* cleaned, organized and commented a large part of the power code,
...
* new procs handling : powernets creation/destruction, cable adding/removing, machines adding/removing,
* new cable laying possibility : if you click in the turf you're standing on, you'll try to lay a node cable in the direction you're facing,
* cleaned oversights that could (and would) leaved an empty powernet in the powernets global list
* rewrote the cut_cable and propagate_network procs to correctly updates every connected cables and machines (fix, at last, #1455 )
* others fixes and polish...
2014-05-04 00:19:55 +02:00
923802cd71
Merge pull request #3619 from Ikarrus/fix3590
...
Runtime fix for putting someone in a human mob before the round starts
2014-05-03 23:10:00 +01:00
eec72aa516
Merge pull request #3472 from Menshin/missing_nodrop
...
Nodrop checks for several machines/structures
2014-05-03 15:44:26 +02:00
dba7d82684
Merge pull request #3579 from Aranclanos/bothandcuffs
...
Fixes issue 2491 -beepsky handcuffing slimes
2014-05-02 17:46:38 +01:00
09f112c9cb
Merge pull request #3572 from Aranclanos/evidencebags
...
Heil myself
2014-05-02 17:46:04 +01:00
64073f0a8d
Merge pull request #3489 from Aranclanos/ChemGrenades
...
Chem grenades asay logs improvements
2014-05-02 17:45:11 +01:00
101e202740
Merge pull request #3597 from phil235/PhotoFIx
...
fixes polaroid camera description
2014-05-02 17:42:55 +01:00
4f8a312275
You can now walk behind the three top parts of the gravity generator, to be able to fix a space breach in the middle of it.
2014-05-02 16:35:54 +01:00
32a9d03b9a
Adds a timer when drawing blood from other people.
2014-05-02 16:44:25 +02:00
d0380956a4
Runtime fix for putting someone in a human mob before the round starts
...
Fixes #3590
2014-05-01 20:29:03 -06:00
b544a945a9
Fixes issue #2489
...
Fixes issue #119
Transferred all the different colours of under clothes and shoes to obj/item/clothing/under/colour/XXX and obj/item/clothing/shoes/sneakers/XXX
Added two extra options to the spawn menu of the game panel, clothing and food.
2014-05-01 06:01:14 -03:00
5fd52bc6a8
Removal of the Locked status from Security HUDs!
2014-04-30 16:39:00 -05:00
3035108aba
used visible_message for flavor text
2014-04-30 14:17:20 -07:00
2853c954c9
Narsie's consume will now spawn remains and gib mobs, and includes a flavorful message.
2014-04-30 13:36:50 -07:00
Cheridan
Alex
Miauw62
fleure
Jordie0608
ikarrus
Rolan7
MrStonedOne
Hornygranny
Zelacks
Razharas
Menshin
phil235
Aranclanos
GunHog