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
49c0a30301
Merge branch 'master' into dev
...
Conflicts:
baystation12.dme
html/changelog.html
2013-09-26 10:26:03 +01:00
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
35621466e1
Merge conflict fix.
2013-09-14 22:49:11 +03:00
09dc90c46b
Fix for stool picking up.
2013-09-13 00:23:16 +06:00
7ab7a61812
Merge resolution, using dev-freeze map.
2013-09-09 21:59:47 -07:00
c7942b7eaf
Merge pull request #3651 from SkyMarshal/airfixes
...
ZAS update, needs testing.
2013-09-07 05:46:04 -07:00
e8f9d19c75
Completed ZAS rework. Needs testing, and consideration to make zones sleep.
2013-09-03 20:25:03 -07:00
073f462e1b
WIP ZAS rework.
2013-09-03 20:25:02 -07:00
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
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
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
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
7dae19a3f9
Fix for #3498 .
2013-08-30 04:40:39 +03:00
dabd0866a2
As above.
2013-08-28 23:34:12 -07:00
c17347ef77
Added CubeJackal's security gear to the appropriate lockers.
2013-08-28 22:31:22 -07:00
4d928843b1
Merge pull request #3609 from Zuhayr/dev
...
Stuff from dev-freeze.
2013-08-28 10:40:58 -07:00
5437b1bbac
Added two ears back.
2013-08-27 22:05:27 +01:00
c0d264fed7
Fixes fire lockers. They actually start with stuff in them.
2013-08-23 20:39:08 -04:00
48dafb1904
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-23 20:02:16 -04:00
40909bde53
Deconstruction fix.
2013-08-23 15:31:37 +03:00
2cf9a18f9e
Merge pull request #3572 from Baystation12/master
...
Merging master into dev.
2013-08-22 23:01:15 -07:00
493dded8fb
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-22 15:29:59 -07:00
57c1a9a556
Code cleanup.
2013-08-22 10:11:49 +03:00
5cee2d2ac2
Species will no longer draw hair not allowed for them. Mirrors will no longer let you choose disallowed hair styles.
2013-08-21 23:26:59 +01:00
1e980a9cc1
Merge branch 'master' into dev
2013-08-15 15:29:53 +01:00
d937900d13
Compile fix.
2013-08-14 10:29:17 -07:00
1c30387a44
Merge resolution in Engineering.dm
2013-08-14 10:05:55 -07:00
033b0450a0
Engineering merge.
2013-08-14 20:00:38 -07:00
cb20332de5
Added potential for chief engineer's locker to spawn with either a brown vest or webbing
2013-08-13 16:16:20 -07:00
f05c44dc23
Praying this works
...
Added Lockable lockers for atmos techs
Adjusted equipment in lockers
Adjusted wardrobe lockers
Added Engineering berets
Rearranged equipment in engineering
Signed-off-by: Jamini <mobiousjami@gmail.com >
2013-08-13 18:57:08 -04:00
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
840468cb14
Fixed the order of update/return statements for dispenser.
2013-08-08 23:17:38 -07:00
23301d9b73
Made dispensers unwrenchable.
2013-08-08 22:56:31 -07:00
618afa1be7
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-08-03 09:16:41 -07:00
a8c04cefc6
Merge.
2013-08-03 09:14:20 -07:00
d51809faa2
Separating autoinjectors box from injector box.
2013-08-02 19:30:02 +03:00
c2712dd9d3
Fix for #3410 .
2013-08-01 20:58:35 +03:00
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
9d2e107005
Reactiveness update part 1: Removed click delays from most objects, keeping them on for attacks and breaking windows/grilles.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-25 18:30:24 +01:00
df8c6cdbcf
Added engineering tape roll to CE closet.
2013-07-24 07:27:06 -07:00
74f951ed75
HoS and Warden's closets get police tape roll.
...
Tape rolls are now available for all security jobs.
2013-07-24 07:20:31 -07:00
b3e5bbdc14
Adds police tape roll to Detective's Cabinet.
...
Signed-off-by: RusskiSam
2013-07-24 04:28:03 +04:00
adc3c14779
Revert #3316 from BEF due to compile errors and (assumed) missing files.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-20 18:38:00 +01:00
08d2e22220
fire update
...
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
2013-07-14 21:20:45 +02:00
c41abfc929
Edits contents of virology biohazard closets to be more virus resistant. Now with robust internals!
2013-07-09 07:02:17 -07:00
df90824d60
Whoa, 2 barsign.dm's? WTF?
2013-07-08 23:25:13 +04:00
5f690e150d
Part 3: fixing shit
2013-07-06 02:53:06 +04:00
63de302a09
Part 2: construction.
2013-07-06 02:53:03 +04:00
0e4271f97c
Stage 1: deconstruction.
2013-07-06 02:53:01 +04:00
fauxki