3b4dbc4f27
Merge pull request #10216 from nukeop/syndiesurgerybag
...
Add Syndicate surgery bag to uplink
2015-06-29 15:52:55 -05:00
0316a836cb
add a Syndicate surgery dufflebag full of tools to the uplink
...
add a Syndicate MMI that lets traitors create subverted cyborgs (not
slaved and with emag laws) - this is included with the surgery bag
2015-06-28 02:54:49 +01:00
8c62ccfe2e
Moves clothes from out of equipment lockers and into wardrobe closets
...
- Wardrobe closets are not locked, so it should make it a bit easier to steal disguises
- Unclutters equipment lockers
- Heads still have their one lockers for convenience, but some of the clothes have been removed if they're already in a department's wardrobe
2015-06-27 17:22:02 -06:00
9591d2255d
Hoping this solves the merge conflict
2015-06-27 19:23:13 +02:00
6cc17a6243
Resolved Conflicts:
...
code/modules/clothing/clothing.dm
code/modules/clothing/masks/gasmask.dm
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
8759f56f6f
Squashed Commits
2015-06-27 00:09:16 -06:00
b9cdb3384a
Merge pull request #9932 from Jordie0608/mycomputerismadewithoverlayswhyisntyours
...
Icon and code improvements to fancy storage, cigarette packs, lighters, droppers and syringes
2015-06-26 15:34:24 -05:00
97aaa5fb8d
Revert "Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs onc…"
2015-06-26 02:44:20 +03:00
69d6cd4f94
Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs once more"
2015-06-26 02:16:02 +03:00
58399f7602
Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
...
Conflicts:
icons/obj/items.dmi
2015-06-24 20:31:51 +10:00
4294a583b0
Microbombs and Macrobombs
2015-06-23 15:36:01 -07:00
a8ec1c76df
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
...
Conflicts:
code/ATMOSPHERICS/atmospherics.dm
code/game/machinery/computer/computer.dm
code/game/objects/items/weapons/explosives.dm
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
code/game/objects/structures/musician.dm
code/game/objects/structures/tables_racks.dm
code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
ea9849a436
Reduce range of the BoH to 7.
2015-06-21 17:20:01 +02:00
b91e99507c
Base Changes for BlueSpace Content Transfer
2015-06-21 15:14:02 +02:00
ee1e30717a
Merge pull request #9980 from LaharlMontogmmery/ContentTransfer
...
Container Content Transfer - Good for Review (Again...Again.)
2015-06-21 00:09:19 +01:00
25445e5a05
Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-06-20 17:32:16 +10:00
2823a98244
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-19 11:23:45 -04:00
1dde070d18
Merge pull request #9800 from Dorsisdwarf/wittybranchname
...
Buffs nuke ops [merge ready]
2015-06-19 12:00:23 +02:00
86d0a50776
Revert dump_act and dump_from_storage
2015-06-18 21:21:41 +02:00
3eb11eb48f
Add extra rustling. Also adding mouse_over for lockers.
2015-06-18 19:55:15 +02:00
38ab424b8b
More OOP! Also preparing the bases for another future PR.
2015-06-18 18:59:04 +02:00
373c918a4a
Going through some hOOPs - bit of a overhaul.
2015-06-18 17:40:35 +02:00
dd25853085
Moved all the istype check to storage_contents_dump_act, and added children for that proc for lockboxes and safes/briefcases
2015-06-17 20:28:40 +02:00
07c3de821e
The bag UI actually refreshes properly now.
2015-06-16 22:03:16 +02:00
0a9db72857
Put the content transfer code into a proc, for maintainability
2015-06-16 21:26:45 +02:00
73af6fabb6
Check Adjacence + expanding the restraint/Stat check
2015-06-16 19:15:32 +02:00
3bc466a0ff
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-16 11:42:47 -04:00
33497c75f6
Placed the code at the wrong place. Woops! Also fixed the bin check and the UI for the bags
2015-06-16 00:08:19 +02:00
4dd2887b74
Committing base Changes
2015-06-15 22:07:30 +02:00
c8d79e7034
Removed unnecessary spaces in these situations:
...
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
4de75c539f
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
...
Conflicts:
code/game/objects/structures/crates_lockers/closets.dm
code/game/objects/structures/table_frames.dm
code/game/objects/structures/windoor_assembly.dm
2015-06-13 14:20:17 -07:00
c2256d41fc
BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH
2015-06-13 13:58:08 -07:00
3e07dbc5a9
Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
...
Conflicts:
icons/obj/chemical.dmi
2015-06-13 20:23:29 +10:00
b7150068cc
Merge pull request #9783 from nukeop/master
...
Adds a chemistry bag for moving large amounts of patches/pills/bottles at once
2015-06-13 04:42:16 +03:00
50e49d1136
FEATURES SIX AND SEVEN: Suicide msg's and cloaks
2015-06-10 14:17:38 -04:00
77b2e54de7
code improvement and overlays for fancy storage, dropper, syringe and lighter
2015-06-10 18:58:19 +10:00
1453513f03
cigarettes overlayed
2015-06-09 16:06:08 +10:00
fc88bce4b6
sets default shotgun ammo to slugs, makes syndicate ammo bag actually have ammo in it
2015-06-05 14:05:32 +01:00
1443ee1c75
add icon for chemistry bag
...
add two chemistry bags to the chemistry closet
add an option to make a chemistry bag to the biogenerator for 200 points
2015-06-04 19:17:44 +01:00
8184d71a1e
add chemistry bag
2015-06-04 14:18:49 +01:00
6618ead426
Readds The Clown Mask
...
lame gimmick chaplains rejoice i guess
2015-06-03 00:32:25 -05:00
6adb4c9507
Adjusts Chaplain Special Bible Equipment
2015-06-03 00:22:53 -05:00
9b90645cec
Merge pull request #9199 from TheVekter/buggate2015
...
Buggate 2015 PART 1: Slimes, drinks, and more!
2015-04-28 22:01:13 +02:00
e846b9c21d
Merge pull request #9195 from TheVekter/stunofholding
...
No longer able to BoH bomb while stunned
2015-04-28 21:57:07 +02:00
edd3daab24
Fixes #9066 , removes description on Noslips
2015-04-27 14:03:51 -05:00
b6191925bd
Fixes #9173
2015-04-26 17:59:05 -05:00
c2151180eb
Merge branch 'master' of https://github.com/tgstation/-tg-station into ClownNamePreferences
...
Conflicts:
code/modules/mob/transform_procs.dm
2015-04-27 00:11:49 +02:00
2ef588e01d
derp
2015-04-25 19:27:20 +02:00
67a14f4c21
Changed how the bible icon is chosen, it's now done manually by clicking the bible as a chaplain (only work once).
2015-04-25 19:21:32 +02:00
a7bd5f93e1
"You hear something" set to italics.
2015-04-24 21:06:16 +03:00
Cheridan
barackobama
Ikarrus
LaharlMontogmmery
Razharas
Jordie0608
Iamgoofball
Remie Richards
Xhuis
Swag McYolosteinen
kingofkosmos
Dorsisdwarf
Cheridan
phil235
TheVekter
phil235