Chinsky
05bb07375e
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into coathanger
2013-10-11 22:22:08 +04:00
Segrain
eb9a337d07
Merge remote-tracking branch 'upstream/master' into dev
2013-10-11 12:44:44 +03:00
Segrain
7ea98f6d79
Examining fix.
2013-10-11 10:19:58 +03:00
Chinsky
e1d2dd4aa1
Coat racks. Can hold either labcoat or detective coat.
2013-10-10 15:33:02 +04:00
Chinsky
b78141e413
Merge branch 'dev' into coathanger
2013-10-10 14:42:42 +04:00
Chinsky
7f62dfc5b1
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/_onclick/hud/alien.dm
code/_onclick/hud/alien_larva.dm
code/_onclick/hud/human.dm
code/_onclick/hud/monkey.dm
code/_onclick/hud/robot.dm
code/setup.dm
2013-10-10 14:30:34 +04:00
Chinsky
cf69a5797d
WIP coat rack
2013-10-10 13:49:42 +04:00
Chinsky
b96f9ef650
Merge pull request #3744 from Baystation12/dev-freeze
...
BYOND AKBAR
2013-10-10 02:45:45 -07:00
Chinsky
3c7c715e06
Merge pull request #3727 from fauxki/dev
...
Dev - Lightswitches for Medbay / Beach Holodeck Update
2013-10-08 21:23:42 -07:00
Mloc-Argent
65f218ee63
Merge branch 'master' into dev-freeze
...
Conflicts:
code/ZAS/Fire.dm
html/changelog.html
maps/tgstation2.dmm
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-08 22:01:16 +01:00
Mloc-Argent
a1f55a50b1
Massive click code rework by SuperSayu, ported from TG.
...
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648
Hopefully done right this time.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-08 20:27:39 +01:00
Chinsky
7555dd0f0b
Merge branch 'master' into dev
...
Conflicts:
code/setup.dm
2013-10-08 15:16:57 +04:00
Mloc-Argent
3d2f92f92c
Made energy weapons not get a bloody overlay.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-07 20:35:35 +01:00
Mloc-Argent
ebf2ba2d4a
Fixes.
...
Made glowshrooms and intercoms not use a ridiculous internal loop, and fixed a pickup luminosity bug with glowshrooms.
fixes #3708
Fixes #3718
Fixes #3702
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-07 20:35:26 +01:00
Mloc-Argent
8b2c3fc153
Massive click code rework by SuperSayu, ported from TG.
...
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-07 20:24:21 +01:00
fauxki
a9de4f00f2
* Adds swimming fins, flotation ducky belt, and snorkel to code. Two of the fins and snorkels will spawn in the athletics closet with the swimming suits. The flotation device spawns on the beach holodeck.
2013-10-05 08:25:03 -07:00
Chinsky
1f53ed0591
Merge pull request #3722 from Baystation12/master
...
Master -> Dev
2013-09-30 16:01:20 -07:00
Chinsky
62ecc88a1f
Fix for #3628
...
Stops dead people from sending PDA messages.
2013-10-01 00:30:12 +04:00
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
Chinsky
c5c65c2f25
Merge pull request #3673 from LethalGhost/patch-1
...
Fix for stool picking up.
2013-09-12 22:51:38 -07:00
Lethal Ghost
09dc90c46b
Fix for stool picking up.
2013-09-13 00:23:16 +06: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
Zuhayr
c7942b7eaf
Merge pull request #3651 from SkyMarshal/airfixes
...
ZAS update, needs testing.
2013-09-07 05:46:04 -07:00
SkyMarshal and SkyMarshal
e8f9d19c75
Completed ZAS rework. Needs testing, and consideration to make zones sleep.
2013-09-03 20:25:03 -07:00
SkyMarshal and SkyMarshal
073f462e1b
WIP ZAS rework.
2013-09-03 20:25:02 -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
Segrain
7dae19a3f9
Fix for #3498 .
2013-08-30 04:40:39 +03:00
Mloc
15b0fc24a3
Merge pull request #3611 from Erthilo/dev
...
Medical tweaks, fixes, admin secrets
2013-08-29 03:51:09 -07:00
Zuhayr
dabd0866a2
As above.
2013-08-28 23:34:12 -07:00
Zuhayr
c17347ef77
Added CubeJackal's security gear to the appropriate lockers.
2013-08-28 22:31:22 -07:00
Mloc
4d928843b1
Merge pull request #3609 from Zuhayr/dev
...
Stuff from dev-freeze.
2013-08-28 10:40:58 -07: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
Chinsky