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
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
Segrain
7dae19a3f9
Fix for #3498 .
2013-08-30 04:40:39 +03: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
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
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
meyar
c0d264fed7
Fixes fire lockers. They actually start with stuff in them.
2013-08-23 20:39:08 -04:00
meyar
48dafb1904
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-23 20:02:16 -04:00
Segrain
40909bde53
Deconstruction fix.
2013-08-23 15:31:37 +03:00
Zuhayr
2cf9a18f9e
Merge pull request #3572 from Baystation12/master
...
Merging master into dev.
2013-08-22 23:01:15 -07: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
57c1a9a556
Code cleanup.
2013-08-22 10:11:49 +03:00
Mloc-Argent
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
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
1e980a9cc1
Merge branch 'master' into dev
2013-08-15 15:29:53 +01:00
Zuhayr
d937900d13
Compile fix.
2013-08-14 10:29:17 -07:00
Zuhayr
1c30387a44
Merge resolution in Engineering.dm
2013-08-14 10:05:55 -07:00
Zuhayr
033b0450a0
Engineering merge.
2013-08-14 20:00:38 -07:00
DJSnapshot
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
Jamini
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
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
840468cb14
Fixed the order of update/return statements for dispenser.
2013-08-08 23:17:38 -07:00
Zuhayr
23301d9b73
Made dispensers unwrenchable.
2013-08-08 22:56:31 -07:00
comma
e45f429e4c
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
maps/tgstation.2.1.0.0.1.dmm
2013-08-04 01:40:32 +04:00
Zuhayr
a470444963
TEMPORARY fix for the too-many-strings RSC corruption issue.
2013-08-03 09:21:53 -07:00
Zuhayr
618afa1be7
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-08-03 09:16:41 -07:00
Zuhayr
a8c04cefc6
Merge.
2013-08-03 09:14:20 -07:00
Segrain
d51809faa2
Separating autoinjectors box from injector box.
2013-08-02 19:30:02 +03:00
Segrain
c2712dd9d3
Fix for #3410 .
2013-08-01 20:58:35 +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
