Chinsky
b80006da9c
Fix for #3713 , dev part
2013-09-30 21:12:22 +04:00
Mloc
49c0a30301
Merge branch 'master' into dev
...
Conflicts:
baystation12.dme
html/changelog.html
2013-09-26 10:26:03 +01:00
Mloc-Argent
e9bf414820
Refactors code to work with BYOND 500.
...
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
/obj/item/color is now item_color
/obj/atmospherics/color is now pipe_color
simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-22 12:39:48 +01:00
Segrain
0b661bc854
Fixes for stacks.
2013-09-19 08:34:38 +03:00
Segrain
c055f722dd
Localised implant detection.
2013-09-14 23:50:31 +03:00
Segrain
35621466e1
Merge conflict fix.
2013-09-14 22:49:11 +03:00
Segrain
d8ad339fd8
Fix for throwing damage.
2013-09-13 19:41:23 +03:00
Segrain
d13f9e617b
Fix for #3666 .
2013-09-13 19:38:21 +03:00
meyar
2dd7fe538b
Derp, deleted airlock access. MY B.
2013-09-12 13:49:49 -04:00
meyar
ef4defdae0
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-09-12 13:16:46 -04:00
meyar
3d6b510395
Restores a magically lost (again) feature. Traitor ID cards being reforgable.
2013-09-12 13:14:57 -04:00
Zuhayr
7ab7a61812
Merge resolution, using dev-freeze map.
2013-09-09 21:59:47 -07:00
Erthilo
3b61ba850f
Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
baystation12.dme
code/modules/projectiles/ammunition/bullets.dm
2013-09-02 23:32:33 +01:00
Erthilo
9e17473f62
Uncomments books. Generifies mentions of tg or baystation.
2013-09-02 18:24:11 +01:00
Erthilo
3662725155
Fixes for monkeycubes.
2013-09-02 17:44:47 +01:00
Erthilo
0008d649b0
Silent fix for megaphone.
2013-09-02 12:26:06 +01:00
Mloc-Argent
a084f74c7d
Expansion of every "icon = ''" path.
...
Supposed to help compilation times. Who knows.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-01 21:53:36 +01:00
Erthilo
961ebcec35
Added Megaphones to all Heads offices.
2013-08-31 22:14:31 +01:00
Erthilo
b69c3b2ee4
Change hailer to hearable message.
2013-08-31 22:11:24 +01:00
Erthilo
547c1e670d
Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work.
2013-08-31 20:12:19 +01:00
Erthilo
b75d97a488
Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/game/machinery/kitchen/gibber.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/reagents/reagent_containers/hypospray.dm
maps/tgstation2.dmm
2013-08-31 17:45:31 +01:00
Erthilo
0219ffe41e
Pull damage, with harsher damage in crit. Soft crit now at 0 health, you no longer suffocate in softcrit. Being between 0 to -50 health will cause you to go into shock. Below that you pass out and stop breathing. Stasis bags clone damage reduced to stop people dieing in them so much.
2013-08-28 17:38:21 +01:00
Erthilo
3557e12943
Suits with shoes protect against glass shards.
2013-08-28 12:49:23 +01:00
Erthilo
0cb361f737
Removed undeeded "ATTACK:"
2013-08-28 03:37:11 +01:00
Erthilo
3fbdc99079
Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.
2013-08-28 03:33:04 +01:00
Erthilo
75f53ba5cd
Reverts IA centcomm messaging due to the fax machine.
2013-08-27 22:12:04 +01:00
Erthilo
5437b1bbac
Added two ears back.
2013-08-27 22:05:27 +01:00
Erthilo
1fd0522276
Gives Internal Affairs PDA a Message Centcomm option. Shortens Centcomm message time as it wasn't really being abused. Formats Centcomm messages better.
2013-08-27 14:24:12 +01:00
Zuhayr
591cde1ccb
Emags now have a ten-use limit.
2013-08-24 19:25:05 -07:00
Segrain
f1f6c07ded
Same mapfix, part 2. Also, minor update.
2013-08-24 09:35:14 +03:00
Zuhayr
75896a8824
Fixes from Ravensdale to robot code, unsure of issue numbers.
2013-08-22 16:10:06 -07:00
Zuhayr
493dded8fb
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-22 15:29:59 -07:00
Segrain
475fae2790
Missing comment.
2013-08-21 05:58:07 +03:00
Erthilo
13caefe138
Uncomments Space Law book content.
2013-08-20 14:20:46 +01:00
Segrain
2304b743ce
Reagent scanner's addition.
2013-08-17 17:00:33 +03:00
Segrain
8456647120
Type check.
2013-08-17 16:58:57 +03:00
Zuhayr
a30f7167bd
Removed outdated var, fixed failure to show garbled monkey speech.
2013-08-17 19:03:20 -07:00
Mloc-Argent
71bdaa1698
Fully reverts clickdelay change.
...
It was immensely buggy with certain mobs, and server lag all but negated the benefits.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-13 13:10:09 +01:00
Mloc
82eb19df9a
Merge pull request #3493 from Zuhayr/master
...
Click delay fixes (part 1)
2013-08-12 05:58:46 -07:00
Zuhayr
44aa77f7de
Adds a delay to the RCD when building.
2013-08-12 22:51:27 -07:00
Erthilo
9d1bbb16d0
Adds explosive implant admin messages, and jump button for explosions.
2013-08-12 12:34:13 +01:00
Zuhayr
375437a6cf
Changelog merge. I hate the changelog.
2013-08-12 11:20:41 -07:00
Erthilo
459aafd523
Fixed borg sprites no resetting with reset board.
2013-08-11 21:32:02 +01:00
Erthilo
070cb50f8d
PDAs can be used when buckled (and not in any other way restrained or stunned). Rejuvenate now completely heals a target or broken organs and viruses too.
2013-08-11 17:13:58 +01:00
Segrain
935a7f30ea
Typo fix.
2013-08-11 09:22:20 +03:00
Zuhayr
a470444963
TEMPORARY fix for the too-many-strings RSC corruption issue.
2013-08-03 09:21:53 -07:00
Segrain
d51809faa2
Separating autoinjectors box from injector box.
2013-08-02 19:30:02 +03:00
comma
95f00d0523
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into medtweaks
2013-08-01 10:03:46 +04:00
comma
bbdcb81868
Added advanced medikits.
2013-08-01 09:58:09 +04:00
comma
c8f5b98a95
Autoinjectors.
...
Now they are one-use, as they were intended.
You can still change their contents with syringes before they are used.
To mitigate their one-use nature, box of them is added to medical closets and supply pack.
2013-08-01 08:12:56 +04:00
